incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r868241 [3/5] - in /websites/staging/sling/trunk/content: ./ documentation/ documentation/bundles/ documentation/development/ documentation/the-sling-engine/ documentation/tutorials-how-tos/ old-stuff/ old-stuff/scriptengineintegration/ pro...
Date Wed, 03 Jul 2013 07:40:21 GMT
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 Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/release-management.html" target="sling_cwiki">/site/release-management.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>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 mirrors source on <code>people.apache.org</code>. 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>
@@ -154,11 +156,11 @@
 </ol>
 <p>Compare the original <code>pom.xml</code> with the one called <code>pom.xml.tag</code> to see if the license or any other info has been removed. This has been known to happen if the starting <code>&lt;project&gt;</code> tag is not on a single line. The only things that should be different between these files are the <code>&lt;version&gt;</code> and <code>&lt;scm&gt;</code> elements. If there are any other changes, you must fix the original <code>pom.xml</code> 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> <span class="p">[</span><span class="n">deploy:deploy</span><span class="p">]</span>
-<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Retrieving</span> <span class="n">previous</span> <span class="n">build</span> <span class="n">number</span> <span class="n">from</span> <span class="n">apache</span><span class="o">.</span><span class="n">snapshots</span><span class="o">.</span><span class="n">https</span>
-<span class="o">...</span>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">deploy</span>
+<span class="p">...</span>
+<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="p">[</span><span class="n">deploy</span><span class="p">:</span><span class="n">deploy</span><span class="p">]</span>
+<span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Retrieving</span> <span class="n">previous</span> <span class="n">build</span> <span class="n">number</span> <span class="n">from</span> <span class="n">apache</span><span class="p">.</span><span class="n">snapshots</span><span class="p">.</span><span class="n">https</span>
+<span class="p">...</span>
 </pre></div>
 
 
@@ -166,15 +168,15 @@
 <p>Make sure the generated artifacts respect the Apache release <a href="http://www.apache.org/dev/release.html">rules</a>: 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</p>
 <p>You should verify the deployment under the <a href="https://repository.apache.org/content/groups/snapshots/org/apache/sling">snapshot</a> repository on Apache</p>
 <h3 id="prepare-the-release">Prepare the release</h3>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">mvn</span> <span class="n">release:clean</span>
-<span class="nv">$</span> <span class="nv">mvn</span> <span class="n">release:prepare</span>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">release</span><span class="p">:</span><span class="n">clean</span>
+$ <span class="n">mvn</span> <span class="n">release</span><span class="p">:</span><span class="n">prepare</span>
 </pre></div>
 
 
 <p>Preparing the release will create the new tag in SVN, automatically checking in on your behalf</p>
 <p>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 <code>mvn release:prepare</code> command until SVN is happy. This is based on a known timing issue when using the European SVN mirror.</p>
 <h3 id="stage-the-release-for-a-vote">Stage the release for a vote</h3>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">mvn</span> <span class="n">release:perform</span>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">release</span><span class="p">:</span><span class="n">perform</span>
 </pre></div>
 
 
@@ -195,33 +197,33 @@
 <p>Note the staging repository URL, especially the number at the end of the URL. You will need this in your vote email</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> <span class="n">Release</span> <span class="n">Apache</span> <span class="n">Sling</span> <span class="n">ABC</span> <span class="n">version</span> <span class="n">X</span><span class="o">.</span><span class="n">Y</span><span class="o">.</span><span class="n">Z</span>
+<div class="codehilite"><pre><span class="n">To</span><span class="p">:</span> &quot;<span class="n">Sling</span> <span class="n">Developers</span> <span class="n">List</span>&quot; <span class="o">&lt;</span><span class="n">dev</span><span class="p">@</span><span class="n">sling</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">&gt;</span>
+<span class="n">Subject</span><span class="p">:</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="n">Release</span> <span class="n">Apache</span> <span class="n">Sling</span> <span class="n">ABC</span> <span class="n">version</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span>
 
 <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">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="p">:</span>
+<span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">issues</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">jira</span><span class="o">/</span><span class="n">browse</span><span class="o">/</span><span class="n">SLING</span><span class="o">/</span><span class="n">fixforversion</span><span class="o">/</span><span class="p">...</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">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="p">:</span>
+<span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">issues</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">jira</span><span class="o">/</span><span class="n">browse</span><span class="o">/</span><span class="n">SLING</span><span class="o">/</span><span class="n">component</span><span class="o">/</span><span class="p">...</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="sr">/orgapachesling-[YOUR REPOSITORY ID]/</span>
+<span class="n">Staging</span> <span class="n">repository</span><span class="p">:</span>
+<span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">repository</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">content</span><span class="o">/</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><span class="o">/</span>
 
-<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> <span class="n">signatures:</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/</span><span class="n">trunk</span><span class="o">/</span><span class="n">check_staged_release</span><span class="o">.</span><span class="n">sh</span>
+<span class="n">You</span> <span class="n">can</span> <span class="n">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="n">and</span> <span class="n">verify</span> <span class="n">the</span> <span class="n">signatures</span><span class="p">:</span>
+<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span><span class="n">check_staged_release</span><span class="p">.</span><span class="n">sh</span>
 
-<span class="n">Usage:</span>
-<span class="n">sh</span> <span class="n">check_staged_release</span><span class="o">.</span><span class="n">sh</span> <span class="p">[</span><span class="n">YOUR</span> <span class="n">REPOSITORY</span> <span class="n">ID</span><span class="p">]</span> <span class="sr">/tmp/s</span><span class="n">ling</span><span class="o">-</span><span class="n">staging</span>
+<span class="n">Usage</span><span class="p">:</span>
+<span class="n">sh</span> <span class="n">check_staged_release</span><span class="p">.</span><span class="n">sh</span> <span class="p">[</span><span class="n">YOUR</span> <span class="n">REPOSITORY</span> <span class="n">ID</span><span class="p">]</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">sling</span><span class="o">-</span><span class="n">staging</span>
 
-<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="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> <span class="p">]</span> <span class="o">+</span><span class="mi">1</span> <span class="n">Approve</span> <span class="n">the</span> <span class="n">release</span>
-  <span class="p">[</span> <span class="p">]</span>  <span class="mi">0</span> <span class="n">Don</span><span class="s">&#39;t care</span>
-<span class="s">  [ ] -1 Don&#39;</span><span class="n">t</span> <span class="n">release</span><span class="p">,</span> <span class="n">because</span> <span class="o">...</span>
+  <span class="p">[</span> <span class="p">]</span> <span class="o">+</span>1 <span class="n">Approve</span> <span class="n">the</span> <span class="n">release</span>
+  <span class="p">[</span> <span class="p">]</span>  0 <span class="n">Don</span><span class="o">&#39;</span><span class="n">t</span> <span class="n">care</span>
+  <span class="p">[</span> <span class="p">]</span> <span class="o">-</span>1 <span class="n">Don</span><span class="o">&#39;</span><span class="n">t</span> <span class="n">release</span><span class="p">,</span> <span class="n">because</span> <span class="p">...</span>
 
-<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>
+<span class="n">This</span> <span class="n">vote</span> <span class="n">will</span> <span class="n">be</span> <span class="n">open</span> <span class="k">for</span> 72 <span class="n">hours</span><span class="p">.</span>
 </pre></div>
 
 
@@ -238,18 +240,18 @@ project to project, but the 'minimum of 
 </blockquote>
 <p>The list of binding voters is available on the <a href="/project-information/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> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="n">Release</span> <span class="n">Apache</span> <span class="n">Sling</span> <span class="n">ABC</span> <span class="n">version</span> <span class="n">X</span><span class="o">.</span><span class="n">Y</span><span class="o">.</span><span class="n">Z</span>
+<div class="codehilite"><pre><span class="n">To</span><span class="p">:</span> &quot;<span class="n">Sling</span> <span class="n">Developers</span> <span class="n">List</span>&quot; <span class="o">&lt;</span><span class="n">dev</span><span class="p">@</span><span class="n">sling</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">&gt;</span>
+<span class="n">Subject</span><span class="p">:</span> <span class="p">[</span><span class="n">RESULT</span><span class="p">]</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">]</span> <span class="n">Release</span> <span class="n">Apache</span> <span class="n">Sling</span> <span class="n">ABC</span> <span class="n">version</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span>
 
 <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="o">+</span>1 <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>1 <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>
+<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="n">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="p">.</span>
 </pre></div>
 
 
@@ -298,6 +300,7 @@ This release is available from http://sl
     <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;
@@ -319,7 +322,7 @@ Enjoy!
 <ol>
 <li>
 <p>Create a public/private pair key:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="n">gen</span><span class="o">-</span><span class="n">key</span>
+<div class="codehilite"><pre>$ <span class="n">gpg</span> <span class="o">--</span><span class="n">gen</span><span class="o">-</span><span class="n">key</span>
 </pre></div>
 
 
@@ -328,9 +331,9 @@ When gpg asks for comment linked the key
 </li>
 <li>
 <p>Add the key to <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="s">&quot;cat toadd.key &gt;&gt; /x1/www/www.apache.org/dist/sling/KEYS&quot;</span>
+<div class="codehilite"><pre>$ <span class="p">(</span><span class="n">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="p">.</span><span class="n">key</span>
+$ <span class="n">scp</span> <span class="n">toadd</span><span class="p">.</span><span class="n">key</span> <span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">:</span>
+$ <span class="n">ssh</span> <span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span> &quot;<span class="nb">cat</span> <span class="n">toadd</span><span class="p">.</span><span class="n">key</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">x1</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">dist</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">KEYS</span>&quot;
 </pre></div>
 
 
@@ -342,16 +345,16 @@ When gpg asks for comment linked the key
 </ol>
 <h2 id="appendix-b-preparing-releases-on-mac-os-x">Appendix B: preparing releases on Mac OS X</h2>
 <p>When running the <code>mvn release:prepare</code> 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> <span class="n">Working</span> <span class="n">directory:</span> <span class="sr">/homedir/</span><span class="n">dev</span><span class="sr">/sling/</span><span class="n">dependencymanager</span>
+<div class="codehilite"><pre><span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Working</span> <span class="n">directory</span><span class="p">:</span> <span class="o">/</span><span class="n">homedir</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">dependencymanager</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="o">------------------------------------------------------------------------</span>
 <span class="p">[</span><span class="n">ERROR</span><span class="p">]</span> <span class="n">BUILD</span> <span class="n">FAILURE</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="o">------------------------------------------------------------------------</span>
 <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Unable</span> <span class="n">to</span> <span class="n">commit</span> <span class="n">files</span>
-<span class="n">Provider</span> <span class="n">message:</span>
-<span class="n">The</span> <span class="n">svn</span> <span class="n">command</span> <span class="n">failed</span><span class="o">.</span>
-<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">&#39;/repos/asf/!svn/act/4f11ad5d-9161-0410-b4dd-cb727141ea8c&#39;</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">Provider</span> <span class="n">message</span><span class="p">:</span>
+<span class="n">The</span> <span class="n">svn</span> <span class="n">command</span> <span class="n">failed</span><span class="p">.</span>
+<span class="n">Command</span> <span class="n">output</span><span class="p">:</span>
+<span class="n">svn</span><span class="p">:</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="p">:</span> <span class="n">MKACTIVITY</span> <span class="n">of</span> <span class="s">&#39;/repos/asf/!svn/act/4f11ad5d-9161-0410-b4dd-cb727141ea8c&#39;</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="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="p">){</span><span class="n">code</span><span class="p">}</span>
 </pre></div>
 
 
@@ -362,7 +365,7 @@ When gpg asks for comment linked the key
 <ol>
 <li>
 <p>Checkout or update the Site Source</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</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="sr">/repos/</span><span class="n">asf</span><span class="sr">/sling/si</span><span class="n">te</span>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">checkout</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">site</span>
 </pre></div>
 
 
@@ -371,12 +374,12 @@ When gpg asks for comment linked the key
 <li>
 <p>Deploy the Descriptor</p>
 <p>To deploy the project descriptor, checkout the tag of the bundle to deploy and run maven</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</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/</span><span class="n">tags</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">tag</span>
-<span class="nv">$</span> <span class="nv">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">\</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="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="o">\</span>
-    <span class="o">-</span><span class="n">DaltDeploymentRepository</span><span class="o">=</span><span class="n">apache</span><span class="o">.</span><span class="nn">releases::default::</span><span class="n">file:</span><span class="sr">///path_to_site_checkout/o</span><span class="n">br</span>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">checkout</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">tags</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">tag</span>
+$ <span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span> <span class="o">\</span>
+    <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">:</span><span class="n">maven</span><span class="o">-</span><span class="n">bundle</span><span class="o">-</span><span class="n">plugin</span><span class="p">:</span><span class="n">deploy</span> <span class="o">\</span>
+    <span class="o">-</span><span class="n">DprefixUrl</span><span class="p">=</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">repo1</span><span class="p">.</span><span class="n">maven</span><span class="p">.</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="p">=</span><span class="n">sling</span><span class="p">.</span><span class="n">xml</span> <span class="o">\</span>
+    <span class="o">-</span><span class="n">DaltDeploymentRepository</span><span class="p">=</span><span class="n">apache</span><span class="p">.</span><span class="n">releases</span><span class="p">::</span><span class="n">default</span><span class="p">::</span><span class="n">file</span><span class="p">:</span><span class="o">///</span><span class="n">path_to_site_checkout</span><span class="o">/</span><span class="n">obr</span>
 </pre></div>
 
 
@@ -385,15 +388,15 @@ When gpg asks for comment linked the key
 <li>
 <p>Variant: Refer to Maven Repository</p>
 <p>Instead of checking out and building the project locally, you may also use the <code>deploy-file</code> 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>
+<div class="codehilite"><pre>$ <span class="n">wget</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">repo1</span><span class="p">.</span><span class="n">maven</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">maven2</span><span class="o">/</span><span class="n">org</span><span class="o">/</span><span class="n">apache</span><span class="o">/</span><span class="n">sling</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">the</span><span class="o">*</span><span class="n">module</span><span class="o">-</span><span class="n">version</span><span class="p">.</span><span class="n">jar</span>
+$ <span class="n">wget</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">repo1</span><span class="p">.</span><span class="n">maven</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">maven2</span><span class="o">/</span><span class="n">org</span><span class="o">/</span><span class="n">apache</span><span class="o">/</span><span class="n">sling</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">the</span><span class="o">*</span><span class="n">module</span><span class="o">-</span><span class="n">version</span><span class="p">.</span><span class="n">pom</span>
+$ <span class="n">mvn</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">felix</span><span class="p">:</span><span class="n">maven</span><span class="o">-</span><span class="n">bundle</span><span class="o">-</span><span class="n">plugin</span><span class="p">:</span><span class="n">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="p">=</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="p">.</span><span class="n">jar</span> <span class="o">-</span><span class="n">DpomFile</span><span class="p">=</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="p">.</span><span class="n">pom</span> <span class="o">\</span>
+    <span class="o">-</span><span class="n">DbundleUrl</span><span class="p">=</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">repo1</span><span class="p">.</span><span class="n">maven</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">maven2</span><span class="o">/</span><span class="n">org</span><span class="o">/</span><span class="n">apache</span><span class="o">/</span><span class="n">sling</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">the</span><span class="o">*</span><span class="n">module</span><span class="o">-</span><span class="n">version</span><span class="p">.</span><span class="n">jar</span> <span class="o">\</span>
+    <span class="o">-</span><span class="n">Durl</span><span class="p">=</span><span class="n">file</span><span class="p">:</span><span class="o">///</span><span class="n">path_to_site_checkout</span><span class="o">/</span><span class="n">obr</span> <span class="o">\</span>
+    <span class="o">-</span><span class="n">DprefixUrl</span><span class="p">=</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">repo1</span><span class="p">.</span><span class="n">maven</span><span class="p">.</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="p">=</span><span class="n">sling</span><span class="p">.</span><span class="n">xml</span>
+$ <span class="n">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="p">.</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="p">.</span><span class="n">pom</span>
 </pre></div>
 
 
@@ -401,7 +404,7 @@ When gpg asks for comment linked the key
 <li>
 <p>Commite the Site Changes</p>
 <p>In the Site checkout folder commit the changes to the <code>obr/sling.xml</code> files (you may also review the changes using the <code>svn diff</code> 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">&quot;Add Bundle ABC Version X.Y.Z&quot;</span> <span class="n">obr</span><span class="o">/</span><span class="n">sling</span><span class="o">.</span><span class="n">xml</span>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span>&quot;<span class="n">Add</span> <span class="n">Bundle</span> <span class="n">ABC</span> <span class="n">Version</span> <span class="n">X</span><span class="p">.</span><span class="n">Y</span><span class="p">.</span><span class="n">Z</span>&quot; <span class="n">obr</span><span class="o">/</span><span class="n">sling</span><span class="p">.</span><span class="n">xml</span>
 </pre></div>
 
 
@@ -409,7 +412,7 @@ When gpg asks for comment linked the key
 <li>
 <p>Update the Site on <a href="people.apache.org">people.apache.org</a></p>
 <p>After committing the changes, you have to update the site source, which is getting mirrored to the web servers on <a href="people.apache.org">people.apache.org</a></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>
+<div class="codehilite"><pre>$ <span class="n">ssh</span> <span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span> <span class="n">svn</span> <span class="n">update</span> <span class="o">/</span><span class="n">x1</span><span class="o">/</span><span class="n">www</span><span class="o">/</span><span class="n">sling</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">obr</span><span class="o">/</span><span class="n">sling</span><span class="p">.</span><span class="n">xml</span>
 </pre></div>
 
 
@@ -417,7 +420,7 @@ When gpg asks for comment linked the key
 </li>
 </ol>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1487493 by dklco on Wed, 29 May 2013 14:05:44 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/repository-based-development.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/repository-based-development.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,15 +83,18 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/repository-based-development.html" target="sling_cwiki">/site/repository-based-development.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Repository Based Development</h1>
       <div class="toc">
 <ul>
 <li><a href="#webdav-support">WebDAV Support</a><ul>
-<li><a href="#example">Example</a><ul>
+<li><a href="#example">Example</a></li>
 <li><a href="#separate-uri-space-webdav">Separate URI Space WebDAV</a></li>
-</ul>
-</li>
 <li><a href="#configuration">Configuration</a><ul>
 <li><a href="#advanced-technical-details">Advanced Technical Details</a></li>
 </ul>
@@ -192,7 +192,7 @@ slingroot/prefix/workspace/item
 <h2 id="eclipse-plugin-for-jcr">Eclipse plugin for JCR</h2>
 <p>TBD</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475909 by dklco on Thu, 25 Apr 2013 19:17:05 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/development/sling.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/sling.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/sling.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/sling.html" target="sling_cwiki">/site/sling.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Maven Sling Plugin</h1>
       <p>The Maven Sling Plugin provides a number of goals which may be of help while developping bundles for Sling. To run the plugin you need at least Maven 2.x and JDK 1.5 or higher. Maven Sling Plugin provides the following goals:</p>
@@ -187,7 +189,7 @@
 <p>The <code>deploy-file</code> goal is equivalent to the <code>deploy</code> goal except, that the <code>deploy-file</code> does not require a project descriptor file while the <code>deploy</code> goal does. In other words the <code>deploy-file</code> goal may used to upload any bundle file available to a Sling OBR server instance.</p>
 <h3 id="use_1">Use</h3>
 <p>The <code>deploy-file</code> goal may only be used from the command line by explicitly calling it as in:</p>
-<div class="codehilite"><pre><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">sling:maven</span><span class="o">-</span><span class="n">sling</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="n">Dsling</span><span class="o">.</span><span class="n">file</span><span class="o">=</span><span class="sr">&lt;file&gt;</span> <span class="o">-</span><span class="n">Dobr</span><span class="o">=</span><span class="sr">&lt;url&gt;</span>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">:</span><span class="n">maven</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">plugin</span><span class="p">:</span><span class="n">deploy</span><span class="o">-</span><span class="n">file</span> <span class="o">-</span><span class="n">Dsling</span><span class="p">.</span><span class="n">file</span><span class="p">=</span><span class="o">&lt;</span><span class="n">file</span><span class="o">&gt;</span> <span class="o">-</span><span class="n">Dobr</span><span class="p">=</span><span class="o">&lt;</span><span class="n">url</span><span class="o">&gt;</span>
 </pre></div>
 
 
@@ -199,7 +201,7 @@
 | <code>bundleFileName</code> | <code>$\{project.build.directory}/$\{project.build.finalName}.jar</code> | <code>sling.file</code> | The path and name of the file to be installed |
 | <code>obr</code> | - | <code>obr</code> | The URL of the running Sling instance to which the bundle is installed. Note that this parameter is required and has no defualt value. It must always be specified in the configuration section or on the command line. |
 Example: To deploy the bundle file <code>someBundle.jar</code> to the OBR running at <code>[http://obr.sample.org](http://obr.sample.org)</code> you might use the goal as follows:</p>
-<div class="codehilite"><pre><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">sling:maven</span><span class="o">-</span><span class="n">sling</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="n">Dsling</span><span class="o">.</span><span class="n">file</span><span class="o">=</span><span class="n">someBundle</span><span class="o">.</span><span class="n">jar</span> <span class="o">-</span><span class="n">Dobr</span><span class="o">=</span><span class="n">http:</span><span class="sr">//o</span><span class="n">br</span><span class="o">.</span><span class="n">sample</span><span class="o">.</span><span class="n">org</span>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">:</span><span class="n">maven</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">plugin</span><span class="p">:</span><span class="n">deploy</span><span class="o">-</span><span class="n">file</span> <span class="o">-</span><span class="n">Dsling</span><span class="p">.</span><span class="n">file</span><span class="p">=</span><span class="n">someBundle</span><span class="p">.</span><span class="n">jar</span> <span class="o">-</span><span class="n">Dobr</span><span class="p">=</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">obr</span><span class="p">.</span><span class="n">sample</span><span class="p">.</span><span class="n">org</span>
 </pre></div>
 
 
@@ -253,7 +255,7 @@ Example: To deploy the bundle file <code
 <p>The <code>install-file</code> goal is equivalent to the <code>install</code> goal except, that the <code>install-file</code> does not require a project descriptor file while the <code>install</code> goal does. In other words the <code>install-file</code> goal may used to upload any bundle file available to a running Sling instance.</p>
 <h3 id="use_3">Use</h3>
 <p>The <code>install-file</code> goal may only be used from the command line by explicitly calling it as in:</p>
-<div class="codehilite"><pre><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">sling:maven</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">plugin:install</span><span class="o">-</span><span class="n">file</span> <span class="o">-</span><span class="n">Dsling</span><span class="o">.</span><span class="n">file</span><span class="o">=</span><span class="sr">&lt;file&gt;</span>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">:</span><span class="n">maven</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">plugin</span><span class="p">:</span><span class="n">install</span><span class="o">-</span><span class="n">file</span> <span class="o">-</span><span class="n">Dsling</span><span class="p">.</span><span class="n">file</span><span class="p">=</span><span class="o">&lt;</span><span class="n">file</span><span class="o">&gt;</span>
 </pre></div>
 
 
@@ -262,7 +264,7 @@ Example: To deploy the bundle file <code
 <p>The <code>install-file</code> supports the same configuration parameters as the <code>install</code> goal with the exception of the <code>skip</code> parameter which makes no sense. In addition, all parameters must be specified on the command line by setting system properties. The <code>bundleFileName</code> parameter specified as the <code>sling.file</code> system property is required by the <code>install-file</code> goal.</p>
 <p>For a description of the parameters see the configuration section of the <a href="#the-install-goal"><code>install</code> goal</a> above.</p>
 <p>Example: To upload the bundle file <code>someBundle.jar</code> you might use the goal as follows:</p>
-<div class="codehilite"><pre><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">sling:maven</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">plugin:install</span><span class="o">-</span><span class="n">file</span> <span class="o">-</span><span class="n">Dsling</span><span class="o">.</span><span class="n">file</span><span class="o">=</span><span class="n">someBundle</span><span class="o">.</span><span class="n">jar</span>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">:</span><span class="n">maven</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">plugin</span><span class="p">:</span><span class="n">install</span><span class="o">-</span><span class="n">file</span> <span class="o">-</span><span class="n">Dsling</span><span class="p">.</span><span class="n">file</span><span class="p">=</span><span class="n">someBundle</span><span class="p">.</span><span class="n">jar</span>
 </pre></div>
 
 
@@ -348,7 +350,7 @@ Example: To deploy the bundle file <code
 | <code>skip</code> | <code>false</code> | <code>sling.validation.skip</code> | Whether to skip the validation |
 | <code>skipJson</code> | <code>false</code> | <code>sling.validation.skipJson</code> | Whether to skip the JSON validation. At the time, there's no difference between <code>skip</code> and <code>skipJson</code> because only JSON files will be validated by now. |</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475862 by dklco on Thu, 25 Apr 2013 17:28:38 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/development/version-policy.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/version-policy.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/version-policy.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/version-policy.html" target="sling_cwiki">/site/version-policy.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Version Policy</h1>
       <p>This page is about how we assign versions to exported packages and bundles and defines when to increase which part of the version number.</p>
@@ -151,12 +153,12 @@ The exports in bundle/api/pom.xml look l
 <p><em>Future</em></p>
 <p>The newest versions of the BND library also support an <code>@Export</code> annotation in the <code>package-info.java</code> pseudo class file. This pseudo class is supported starting with Java 5 to take package level annotations (like the <code>@Export</code> annotation) and as a replacement of the <code>package-info.html</code> file.</p>
 <p>Using this syntax something like the following would be easily possible:</p>
-<div class="codehilite"><pre><span class="o">/**</span>
- <span class="o">*</span> <span class="n">This</span> <span class="n">is</span> <span class="n">the</span> <span class="n">Package</span> <span class="n">Level</span> <span class="n">JavaDoc</span>
- <span class="o">*/</span>
-<span class="nv">@Export</span><span class="p">(</span><span class="n">version</span> <span class="o">=</span> <span class="s">&quot;1.0&quot;</span><span class="p">)</span>
-<span class="nb">package</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">sling</span><span class="o">.</span><span class="n">api</span><span class="o">.</span><span class="n">auth</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">aQute</span><span class="o">.</span><span class="n">bnd</span><span class="o">.</span><span class="n">annotation</span><span class="o">.</span><span class="n">Export</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="cm">/**</span>
+<span class="cm"> * This is the Package Level JavaDoc</span>
+<span class="cm"> */</span>
+<span class="p">@</span><span class="n">Export</span><span class="p">(</span><span class="n">version</span> <span class="o">=</span> <span class="s">&quot;1.0&quot;</span><span class="p">)</span>
+<span class="kn">package</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">api</span><span class="p">.</span><span class="n">auth</span><span class="p">;</span>
+<span class="kn">import</span> <span class="nn">aQute</span><span class="p">.</span><span class="n">bnd</span><span class="p">.</span><span class="n">annotation</span><span class="p">.</span><span class="n">Export</span><span class="p">;</span>
 </pre></div>
 
 
@@ -167,7 +169,7 @@ The exports in bundle/api/pom.xml look l
 <div class="codehilite"><pre><span class="o">*</span> <span class="n">the</span> <span class="n">major</span> <span class="n">segment</span> <span class="n">indicates</span> <span class="n">breakage</span> <span class="n">in</span> <span class="n">the</span> <span class="n">API</span>
 <span class="o">*</span> <span class="n">the</span> <span class="n">minor</span> <span class="n">segment</span> <span class="n">indicates</span> <span class="o">*</span><span class="n">externally</span> <span class="n">visible</span><span class="o">*</span> <span class="n">changes</span>
 <span class="o">*</span> <span class="n">the</span> <span class="n">micro</span> <span class="n">segment</span> <span class="n">indicates</span> <span class="n">bug</span> <span class="n">fixes</span>
-<span class="o">*</span> <span class="n">the</span> <span class="n">qualifier</span> <span class="n">segment</span> <span class="n">is</span> <span class="ow">not</span> <span class="n">generally</span> <span class="n">used</span> <span class="n">but</span> <span class="n">may</span> <span class="n">be</span> <span class="n">used</span> <span class="n">to</span> <span class="n">convey</span> <span class="n">more</span> <span class="n">information</span> <span class="n">about</span> <span class="n">a</span> <span class="n">particular</span> <span class="n">build</span><span class="p">,</span> <span class="n">such</span> <span class="n">as</span> <span class="n">a</span> <span class="n">build</span> <span class="nb">time</span> <span class="ow">or</span> <span class="n">an</span> <span class="n">SVN</span> <span class="n">revision</span> <span class="n">number</span><span class="o">.</span>
+<span class="o">*</span> <span class="n">the</span> <span class="n">qualifier</span> <span class="n">segment</span> <span class="n">is</span> <span class="n">not</span> <span class="n">generally</span> <span class="n">used</span> <span class="n">but</span> <span class="n">may</span> <span class="n">be</span> <span class="n">used</span> <span class="n">to</span> <span class="n">convey</span> <span class="n">more</span> <span class="n">information</span> <span class="n">about</span> <span class="n">a</span> <span class="n">particular</span> <span class="n">build</span><span class="p">,</span> <span class="n">such</span> <span class="n">as</span> <span class="n">a</span> <span class="n">build</span> <span class="n">time</span> <span class="n">or</span> <span class="n">an</span> <span class="n">SVN</span> <span class="n">revision</span> <span class="n">number</span><span class="p">.</span>
 </pre></div>
 
 
@@ -222,14 +224,14 @@ The exports in bundle/api/pom.xml look l
 <li>If such a lower bound exists, the upper bound is exclusive the next major version number.</li>
 </ul>
 <p>For example if importing the <code>api</code> package exported at version 1.2.3, the <code>Import-Package</code> statement is generated as</p>
-<div class="codehilite"><pre><span class="n">Import</span><span class="o">-</span><span class="n">Package:</span> <span class="n">api</span><span class="p">;</span><span class="n">version</span><span class="o">=</span><span class="p">[</span><span class="mf">1.2.3</span><span class="p">,</span><span class="mf">2.0.0</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="n">Import</span><span class="o">-</span><span class="n">Package</span><span class="p">:</span> <span class="n">api</span><span class="p">;</span><span class="n">version</span><span class="p">=[</span>1<span class="p">.</span>2<span class="p">.</span>3<span class="p">,</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="p">)</span>
 </pre></div>
 
 
 <p>This default works well for consumers of the API, since according to above definitions an API is guaranteed to not contain breakages if the major version number is not increased.</p>
 <p>For bundles implementing the API, this default does not work well, since from their point of view an <em>externally visible</em> change in fact constitutes a breakage, because the implementation is not complete. So if a bundle implements a package a manually crafted import version should be defined which includes the export version of the defining bundle but excludes the next minor version.</p>
 <p>For example implementing the <code>api</code> package exported at version 1.2.3, would require the following manually created <code>Import-Package</code> statement:</p>
-<div class="codehilite"><pre><span class="n">Import</span><span class="o">-</span><span class="n">Package:</span> <span class="n">api</span><span class="p">;</span><span class="n">version</span><span class="o">=</span><span class="p">[</span><span class="mf">1.2.3</span><span class="p">,</span><span class="mf">1.3.0</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="n">Import</span><span class="o">-</span><span class="n">Package</span><span class="p">:</span> <span class="n">api</span><span class="p">;</span><span class="n">version</span><span class="p">=[</span>1<span class="p">.</span>2<span class="p">.</span>3<span class="p">,</span>1<span class="p">.</span>3<span class="p">.</span>0<span class="p">)</span>
 </pre></div>
 
 
@@ -243,7 +245,7 @@ The exports in bundle/api/pom.xml look l
 <a href="http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf">Semantic Versioning</a> -- An OSGi Alliance paper on semantic versioning.
 <a href="http://www.aqute.biz/Code/XBnd">Bnd Experimental</a> -- Experimental extensions to the BND library; unfortunately these extensions are not yet usable with Maven Bundle Plugin 2.1.0 due to API changes in the BND library not supported by the plugin.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475804 by dklco on Thu, 25 Apr 2013 14:45:50 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/getting-started.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/getting-started.html (original)
+++ websites/staging/sling/trunk/content/documentation/getting-started.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/getting-started.html" target="sling_cwiki">/site/getting-started.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Getting Started</h1>
       <p>We're on the way to update the documentation to make it more easy to get in touch with Sling. At the moment we can give you the following starting points:</p>
@@ -106,7 +108,7 @@
 <li><a href="/documentation/the-sling-engine/eventing-and-jobs.html">Eventing and Jobs</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475804 by dklco on Thu, 25 Apr 2013 14:45:50 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/the-sling-engine.html" target="sling_cwiki">/site/the-sling-engine.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>The Sling Engine</h1>
       <h2 id="general">General</h2>
@@ -116,7 +118,7 @@
 <li><a href="/documentation/the-sling-engine/eventing-and-jobs.html">Eventing and Jobs</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1345726 by fmeschbe on Sun, 3 Jun 2012 17:57:55 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/architecture.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/architecture.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/architecture.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/architecture.html" target="sling_cwiki">/site/architecture.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Architecture</h1>
       <p>The following is a short list of high-lights of Sling:</p>
@@ -143,7 +145,7 @@
 <p>Optionally, PAX Web's implementation of HttpService can be used when Sling is launched as a standalone Java Application. See the <a href="/documentation/development/maven-launchpad-plugin.html">Maven Launchpad Plugin</a> page for information on how to do this.</p>
 <p>See <a href="/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</a> for more information.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475862 by dklco on Thu, 25 Apr 2013 17:28:38 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/authentication.html" target="sling_cwiki">/site/authentication.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Authentication</h1>
       <p>This section describes the framework provided by Sling to authenticate HTTP requests.</p>
@@ -110,7 +112,7 @@
 <li><a href="/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html">AuthenticationHandler</a>: The {{AuthenticationHandler}} interface defines the service API which may be implemented by authentication handlers registered as OSGi services. </li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1345726 by fmeschbe on Sun, 3 Jun 2012 17:57:55 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/default-mapping-and-rendering.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/default-mapping-and-rendering.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/default-mapping-and-rendering.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,11 +83,16 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/default-mapping-and-rendering.html" target="sling_cwiki">/site/default-mapping-and-rendering.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Default Mapping and Rendering</h1>
       <p>This page contained obsolete content, moved it to http://cwiki.apache.org/confluence/display/SLING/Default+Mapping+and+Rendering+%28OBSOLETE%29 in case it is useful to someone.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341376 by fmeschbe on Tue, 22 May 2012 09:41:06 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/dispatching-requests.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/dispatching-requests.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/dispatching-requests.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/dispatching-requests.html" target="sling_cwiki">/site/dispatching-requests.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Dispatching Requests</h1>
       <h2 id="main-process">Main process</h2>
@@ -192,7 +194,7 @@ If any called filter doesn't call <code>
 <p>Constants are defined in the <code>org.apache.sling.api.SlingConstants</code> class for these request attributes.</p>
 <p><em>Note:</em> These request attributes are not set if the servlet or script is called to handle the request or as a result of <code>RequestDispatcher.forward</code>.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1453385 by bdelacretaz on Wed, 6 Mar 2013 15:28:50 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project



Mime
View raw message