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 [4/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/the-sling-engine/errorhandling.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/errorhandling.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/errorhandling.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/errorhandling.html" target="sling_cwiki">/site/errorhandling.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Errorhandling</h1>
       <p>The Sling Engine includes support for handling uncaught <code>Throwable</code> as well as rendering custom HTTP status code pages. This is implemented by expecting a (single) <code>org.apache.sling.engine.servlets.ErrorHandler</code> service to which handling of uncaught <code>Throwable</code> and HTTP status responses are delegated.</p>
@@ -143,7 +145,7 @@ To register a catch-all handler for any 
 <p>Starting with Sling Servlet Resolver version 2.0.10 the default error handler servlet is looked up using the string <code>default</code> as the request extension and the provided default servlet is registered as <code>&lt;prefix&gt;/sling/servlet/errorhandler/default.servlet</code> where <prefix> is the last entry in the resource resolver search path, <code>/libs</code> by default.</p>
 <p>Thus to overwrite the default error handler servlet provide a servlet or script for the <code>default</code> extension, for example <code>/apps/sling/servlet/errorhandler/default.groovy</code>.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1444446 by fmeschbe on Sat, 9 Feb 2013 21:50:12 +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/eventing-and-jobs.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/eventing-and-jobs.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/eventing-and-jobs.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/eventing-and-jobs.html" target="sling_cwiki">/site/eventing-and-jobs.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Eventing, Jobs, and Scheulding</h1>
       <p>Apache Sling provides some mechanisms and support for eventing, handling jobs and scheduling. </p>
@@ -226,7 +228,7 @@ The existance of this flag allows to reg
 <h2 id="scheduling">Scheduling</h2>
 <p>The scheduler is a service which uses the open source Quartz library. The scheduler has methods to start jobs periodically or with a cron definition. In addition, a service either implementing =java.lang.Runnable= or =org.quartz.job= is started through the whiteboard pattern <em>if</em> it either contains a configuration property =scheduler.expression= or =scheduler.period=. The job is started with the ~PID of the service - if the service has no PID, the configuration property =scheduler.name= must be set.</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/mappings-for-resource-resolution.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/mappings-for-resource-resolution.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/mappings-for-resource-resolution.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/mappings-for-resource-resolution.html" target="sling_cwiki">/site/mappings-for-resource-resolution.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Mappings for Resource Resolution</h1>
       <h2 id="configuration">Configuration</h2>
@@ -115,24 +117,24 @@
 <p>Each entry in the mapping table is a regular expression, which is constructed from the resource path below <code>/etc/map</code>. If any resource along the path has a <code>sling:match</code> property, the respective value is used in the corresponding segment instead of the resource name. Only resources either having a <code>sling:redirect</code> or <code>sling:internalRedirect</code> property are used as table entries. Other resources in the tree are just used to build the mapping structure.</p>
 <p><em>Example</em></p>
 <p>Consider the following content</p>
-<div class="codehilite"><pre><span class="sr">/etc/m</span><span class="n">ap</span>
+<div class="codehilite"><pre><span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">map</span>
       <span class="o">+--</span> <span class="n">http</span>
-           <span class="o">+--</span> <span class="n">example</span><span class="o">.</span><span class="n">com</span><span class="mf">.80</span>
-                <span class="o">+--</span> <span class="n">sling:redirect</span> <span class="o">=</span> <span class="s">&quot;http://www.example.com/&quot;</span>
-           <span class="o">+--</span> <span class="n">www</span><span class="o">.</span><span class="n">example</span><span class="o">.</span><span class="n">com</span><span class="mf">.80</span>
-                <span class="o">+--</span> <span class="n">sling:internalRedirect</span> <span class="o">=</span> <span class="s">&quot;/example&quot;</span>
-           <span class="o">+--</span> <span class="n">any_example</span><span class="o">.</span><span class="n">com</span><span class="mf">.80</span>
-                <span class="o">+--</span> <span class="n">sling:match</span> <span class="o">=</span> <span class="s">&quot;.+\.example\.com\.80&quot;</span>
-                <span class="o">+--</span> <span class="n">sling:redirect</span> <span class="o">=</span> <span class="s">&quot;http://www.example.com/&quot;</span>
+           <span class="o">+--</span> <span class="n">example</span><span class="p">.</span><span class="n">com</span><span class="p">.</span>80
+                <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">redirect</span> <span class="p">=</span> &quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">example</span><span class="p">.</span><span class="n">com</span><span class="o">/</span>&quot;
+           <span class="o">+--</span> <span class="n">www</span><span class="p">.</span><span class="n">example</span><span class="p">.</span><span class="n">com</span><span class="p">.</span>80
+                <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">internalRedirect</span> <span class="p">=</span> &quot;<span class="o">/</span><span class="n">example</span>&quot;
+           <span class="o">+--</span> <span class="n">any_example</span><span class="p">.</span><span class="n">com</span><span class="p">.</span>80
+                <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">match</span> <span class="p">=</span> &quot;<span class="p">.</span><span class="o">+\</span><span class="p">.</span><span class="n">example</span><span class="o">\</span><span class="p">.</span><span class="n">com</span><span class="o">\</span><span class="p">.</span>80&quot;
+                <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">redirect</span> <span class="p">=</span> &quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">example</span><span class="p">.</span><span class="n">com</span><span class="o">/</span>&quot;
            <span class="o">+--</span> <span class="n">localhost_any</span>
-                <span class="o">+--</span> <span class="n">sling:match</span> <span class="o">=</span> <span class="s">&quot;localhost\.\d*&quot;</span>
-                <span class="o">+--</span> <span class="n">sling:internalRedirect</span> <span class="o">=</span> <span class="s">&quot;/content&quot;</span>
+                <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">match</span> <span class="p">=</span> &quot;<span class="n">localhost</span><span class="o">\.\</span><span class="n">d</span><span class="o">*</span>&quot;
+                <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">internalRedirect</span> <span class="p">=</span> &quot;<span class="o">/</span><span class="n">content</span>&quot;
                 <span class="o">+--</span> <span class="n">cgi</span><span class="o">-</span><span class="n">bin</span>
-                     <span class="o">+--</span> <span class="n">sling:internalRedirect</span> <span class="o">=</span> <span class="s">&quot;/scripts&quot;</span>
+                     <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">internalRedirect</span> <span class="p">=</span> &quot;<span class="o">/</span><span class="n">scripts</span>&quot;
                 <span class="o">+--</span> <span class="n">gateway</span>
-                     <span class="o">+--</span> <span class="n">sling:internalRedirect</span> <span class="o">=</span> <span class="s">&quot;http://gbiv.com&quot;</span>
+                     <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">internalRedirect</span> <span class="p">=</span> &quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">gbiv</span><span class="p">.</span><span class="n">com</span>&quot;
                 <span class="o">+--</span> <span class="p">(</span><span class="n">stories</span><span class="p">)</span>
-                     <span class="o">+--</span> <span class="n">sling:internalRedirect</span> <span class="o">=</span> <span class="s">&quot;/anecdotes/$1&quot;</span>
+                     <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">internalRedirect</span> <span class="p">=</span> &quot;<span class="o">/</span><span class="n">anecdotes</span><span class="o">/</span>$1&quot;
 </pre></div>
 
 
@@ -149,16 +151,16 @@
 <h3 id="regular-expression-matching">Regular Expression matching</h3>
 <p>As said above the mapping entries are regular expressions which are matched against path. As such these regular expressions may also contain capturing groups as shown in the example above: <code>http/localhost\.\d*/(stories)</code>. After matching the path against the regular expression, the replacement pattern is applied which allows references back to the capturing groups.</p>
 <p>To illustrate the matching and replacement is applied according to the following pseudo code:</p>
-<div class="codehilite"><pre><span class="n">String</span> <span class="n">path</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getScheme</span> <span class="o">+</span> <span class="s">&quot;/&quot;</span> <span class="o">+</span> <span class="n">request</span><span class="o">.</span><span class="n">getServerName</span><span class="p">()</span> <span class="o">+</span> <span class="s">&quot;.&quot;</span> <span class="o">+</span> <span class="n">request</span><span class="o">.</span><span class="n">getServerPort</span><span class="p">()</span> <span class="o">+</span> <span class="s">&quot;/&quot;</span> <span class="o">+</span> <span class="n">request</span><span class="o">.</span><span class="n">getPathInfo</span><span class="p">();</span>
-<span class="n">String</span> <span class="n">result</span> <span class="o">=</span> <span class="n">null</span><span class="p">;</span>
-<span class="k">for</span> <span class="p">(</span><span class="n">MapEntry</span> <span class="n">entry:</span> <span class="n">mapEntries</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">Matcher</span> <span class="n">matcher</span> <span class="o">=</span> <span class="n">entry</span><span class="o">.</span><span class="n">pattern</span><span class="o">.</span><span class="n">matcher</span><span class="p">(</span><span class="n">path</span><span class="p">);</span>
-    <span class="k">if</span> <span class="p">(</span><span class="n">matcher</span><span class="o">.</span><span class="n">find</span><span class="p">())</span> <span class="p">{</span>
-        <span class="n">StringBuffer</span> <span class="n">buf</span> <span class="o">=</span> <span class="k">new</span> <span class="n">StringBuffer</span><span class="p">();</span>
-        <span class="n">matcher</span><span class="o">.</span><span class="n">appendReplacement</span><span class="p">(</span><span class="n">buf</span><span class="p">,</span> <span class="n">entry</span><span class="o">.</span><span class="n">getRedirect</span><span class="p">());</span>
-        <span class="n">matcher</span><span class="o">.</span><span class="n">appendTail</span><span class="p">(</span><span class="n">buf</span><span class="p">);</span>
-        <span class="n">result</span> <span class="o">=</span> <span class="n">buf</span><span class="o">.</span><span class="n">toString</span><span class="p">();</span>
-        <span class="n">break</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">String</span> <span class="n">path</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getScheme</span> <span class="o">+</span> &quot;<span class="o">/</span>&quot; <span class="o">+</span> <span class="n">request</span><span class="p">.</span><span class="n">getServerName</span><span class="p">()</span> <span class="o">+</span> &quot;<span class="p">.</span>&quot; <span class="o">+</span> <span class="n">request</span><span class="p">.</span><span class="n">getServerPort</span><span class="p">()</span> <span class="o">+</span> &quot;<span class="o">/</span>&quot; <span class="o">+</span> <span class="n">request</span><span class="p">.</span><span class="n">getPathInfo</span><span class="p">();</span>
+<span class="n">String</span> <span class="n">result</span> <span class="p">=</span> <span class="n">null</span><span class="p">;</span>
+<span class="k">for</span> <span class="p">(</span><span class="n">MapEntry</span> <span class="n">entry</span><span class="p">:</span> <span class="n">mapEntries</span><span class="p">)</span> <span class="p">{</span>
+    <span class="n">Matcher</span> <span class="n">matcher</span> <span class="p">=</span> <span class="n">entry</span><span class="p">.</span><span class="n">pattern</span><span class="p">.</span><span class="n">matcher</span><span class="p">(</span><span class="n">path</span><span class="p">);</span>
+    <span class="k">if</span> <span class="p">(</span><span class="n">matcher</span><span class="p">.</span><span class="nb">find</span><span class="p">())</span> <span class="p">{</span>
+        <span class="n">StringBuffer</span> <span class="n">buf</span> <span class="p">=</span> <span class="n">new</span> <span class="n">StringBuffer</span><span class="p">();</span>
+        <span class="n">matcher</span><span class="p">.</span><span class="n">appendReplacement</span><span class="p">(</span><span class="n">buf</span><span class="p">,</span> <span class="n">entry</span><span class="p">.</span><span class="n">getRedirect</span><span class="p">());</span>
+        <span class="n">matcher</span><span class="p">.</span><span class="n">appendTail</span><span class="p">(</span><span class="n">buf</span><span class="p">);</span>
+        <span class="n">result</span> <span class="p">=</span> <span class="n">buf</span><span class="p">.</span><span class="n">toString</span><span class="p">();</span>
+        <span class="k">break</span><span class="p">;</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
@@ -169,10 +171,10 @@
 <h3 id="redirection-values">Redirection Values</h3>
 <p>The result of matching the request path and getting the redirection is either a path into the resource tree or another URL. If the result is an URL, it is converted into a path again and matched against the mapping entries. This may be taking place repeatedly until an absolute or relative path into the resource tree results.</p>
 <p>The following pseudo code summarizes this behaviour:</p>
-<div class="codehilite"><pre><span class="n">String</span> <span class="n">path</span> <span class="o">=</span> <span class="o">....</span><span class="p">;</span>
-<span class="n">String</span> <span class="n">result</span> <span class="o">=</span> <span class="n">path</span><span class="p">;</span>
-<span class="k">do</span> <span class="p">{</span>
-    <span class="n">result</span> <span class="o">=</span> <span class="n">applyMapEntries</span><span class="p">(</span><span class="n">result</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">String</span> <span class="n">path</span> <span class="p">=</span> <span class="p">....;</span>
+<span class="n">String</span> <span class="n">result</span> <span class="p">=</span> <span class="n">path</span><span class="p">;</span>
+<span class="n">do</span> <span class="p">{</span>
+    <span class="n">result</span> <span class="p">=</span> <span class="n">applyMapEntries</span><span class="p">(</span><span class="n">result</span><span class="p">);</span>
 <span class="p">}</span> <span class="k">while</span> <span class="p">(</span><span class="n">isURL</span><span class="p">(</span><span class="n">result</span><span class="p">));</span>
 </pre></div>
 
@@ -188,32 +190,32 @@
 <h3 id="drilling-down-the-resource-tree">Drilling Down the Resource Tree</h3>
 <p>Drilling down the resource tree starts at the root and for each segment in the path checks whether a child resource of the given name exists or not. If not, a child resource is looked up, which has a <code>sling:alias</code> property whose value matches the given name. If neither exists, the search is terminated and the resource cannot be resolved.</p>
 <p>The following pseudo code shows this algorithm assuming the path is absolute:</p>
-<div class="codehilite"><pre><span class="n">String</span> <span class="n">path</span> <span class="o">=</span> <span class="o">...</span><span class="p">;</span> <span class="sr">//</span> <span class="n">the</span> <span class="n">absolute</span> <span class="n">path</span>
-<span class="n">Resource</span> <span class="n">current</span> <span class="o">=</span> <span class="n">getResource</span><span class="p">(</span><span class="s">&quot;/&quot;</span><span class="p">);</span>
-<span class="n">String</span><span class="o">[]</span> <span class="n">segments</span> <span class="o">=</span> <span class="n">path</span><span class="o">.</span><span class="nb">split</span><span class="p">(</span><span class="s">&quot;/&quot;</span><span class="p">);</span>
-<span class="k">for</span> <span class="p">(</span><span class="n">String</span> <span class="n">segment:</span> <span class="n">segments</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">Resource</span> <span class="n">child</span> <span class="o">=</span> <span class="n">getResource</span><span class="p">(</span><span class="n">current</span><span class="p">,</span> <span class="n">segment</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">String</span> <span class="n">path</span> <span class="p">=</span> <span class="p">...;</span> <span class="o">//</span> <span class="n">the</span> <span class="n">absolute</span> <span class="n">path</span>
+<span class="n">Resource</span> <span class="n">current</span> <span class="p">=</span> <span class="n">getResource</span><span class="p">(</span>&quot;<span class="o">/</span>&quot;<span class="p">);</span>
+<span class="n">String</span><span class="p">[]</span> <span class="n">segments</span> <span class="p">=</span> <span class="n">path</span><span class="p">.</span><span class="n">split</span><span class="p">(</span>&quot;<span class="o">/</span>&quot;<span class="p">);</span>
+<span class="k">for</span> <span class="p">(</span><span class="n">String</span> <span class="n">segment</span><span class="p">:</span> <span class="n">segments</span><span class="p">)</span> <span class="p">{</span>
+    <span class="n">Resource</span> <span class="n">child</span> <span class="p">=</span> <span class="n">getResource</span><span class="p">(</span><span class="n">current</span><span class="p">,</span> <span class="n">segment</span><span class="p">);</span>
     <span class="k">if</span> <span class="p">(</span><span class="n">child</span> <span class="o">==</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-        <span class="n">Iterator</span><span class="sr">&lt;Resource&gt;</span> <span class="n">children</span> <span class="o">=</span> <span class="n">listChildren</span><span class="p">(</span><span class="n">current</span><span class="p">);</span>
-        <span class="n">current</span> <span class="o">=</span> <span class="n">null</span><span class="p">;</span>
-        <span class="k">while</span> <span class="p">(</span><span class="n">children</span><span class="o">.</span><span class="n">hasNext</span><span class="p">())</span> <span class="p">{</span>
-            <span class="n">child</span> <span class="o">=</span> <span class="n">children</span><span class="o">.</span><span class="k">next</span><span class="p">();</span>
-            <span class="k">if</span> <span class="p">(</span><span class="n">segment</span><span class="o">.</span><span class="n">equals</span><span class="p">(</span><span class="n">getSlingAlias</span><span class="p">(</span><span class="n">child</span><span class="p">)))</span> <span class="p">{</span>
-                <span class="n">current</span> <span class="o">=</span> <span class="n">child</span><span class="p">;</span>
-                <span class="n">break</span><span class="p">;</span>
+        <span class="n">Iterator</span><span class="o">&lt;</span><span class="n">Resource</span><span class="o">&gt;</span> <span class="n">children</span> <span class="p">=</span> <span class="n">listChildren</span><span class="p">(</span><span class="n">current</span><span class="p">);</span>
+        <span class="n">current</span> <span class="p">=</span> <span class="n">null</span><span class="p">;</span>
+        <span class="k">while</span> <span class="p">(</span><span class="n">children</span><span class="p">.</span><span class="n">hasNext</span><span class="p">())</span> <span class="p">{</span>
+            <span class="n">child</span> <span class="p">=</span> <span class="n">children</span><span class="p">.</span><span class="n">next</span><span class="p">();</span>
+            <span class="k">if</span> <span class="p">(</span><span class="n">segment</span><span class="p">.</span><span class="n">equals</span><span class="p">(</span><span class="n">getSlingAlias</span><span class="p">(</span><span class="n">child</span><span class="p">)))</span> <span class="p">{</span>
+                <span class="n">current</span> <span class="p">=</span> <span class="n">child</span><span class="p">;</span>
+                <span class="k">break</span><span class="p">;</span>
             <span class="p">}</span>
         <span class="p">}</span>
         <span class="k">if</span> <span class="p">(</span><span class="n">current</span> <span class="o">==</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-            <span class="sr">//</span> <span class="n">fail</span>
-            <span class="n">break</span><span class="p">;</span>
+            <span class="o">//</span> <span class="n">fail</span>
+            <span class="k">break</span><span class="p">;</span>
         <span class="p">}</span>
     <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="n">current</span> <span class="o">=</span> <span class="n">child</span><span class="p">;</span>
+        <span class="n">current</span> <span class="p">=</span> <span class="n">child</span><span class="p">;</span>
     <span class="p">}</span>
 <span class="p">}</span>
 </pre></div>
       <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/request-listeners.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/request-listeners.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/request-listeners.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,36 +83,43 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/request-listeners.html" target="sling_cwiki">/site/request-listeners.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Request Listeners</h1>
       <p>Sling provides the possibility to "listen" to a request processed by the Sling Engine (<code>SlingMainServlet</code>). To get notified you implement the service interface <code>org.apache.sling.api.request.SlingRequestListener</code>.</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>SlingRequestListener</B></DIV><DIV class="codeContent panelContent">
-    public interface SlingRequestListener {</p>
-<div class="codehilite"><pre>    static final String SERVICE_NAME = &quot;org.apache.sling.api.request.SlingRequestListener&quot;;
-
-    /**
-     * This method is called from the Sling application for every
-     * <span class="nt">&lt;code&gt;</span>EventType<span class="nt">&lt;/code&gt;</span> appearing during the dispatching of
-     * a Sling request  
-     * 
-     * @param sre the object representing the event
-     * 
-     * @see org.apache.sling.api.request.SlingRequestEvent.EventType
-     */
-    public void onEvent( SlingRequestEvent sre );
-}
-</pre></div>
-
-
-<p>There are no special properties to set. </p>
-<h2 id="supported-types-of-events">Supported types of events</h2>
-<p>At the moment you will get two different types of <code>SlingRequestEvent</code>:
-| events types (<code>SlingRequestEvent.EventType</code>) | point in time |
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>SlingRequestListener</B></DIV><DIV class="codeContent panelContent">
+    public interface SlingRequestListener {
+
+        static final String SERVICE_NAME = "org.apache.sling.api.request.SlingRequestListener"; 
+
+        /**
+         * This method is called from the Sling application for every
+         * <code>EventType</code> appearing during the dispatching of
+         * a Sling request  
+         * 
+         * @param sre the object representing the event
+         * 
+         * @see org.apache.sling.api.request.SlingRequestEvent.EventType
+         */
+        public void onEvent( SlingRequestEvent sre );
+    }
+
+
+There are no special properties to set. 
+
+## Supported types of events
+
+At the moment you will get two different types of `SlingRequestEvent`:
+| events types (`SlingRequestEvent.EventType`) | point in time |
 |--|--|
-| EVENT_INIT | after entering the <code>service</code> method in <code>SlingMainServlet</code>. Note that this will be <em>after</em> the <code>handleSecurity</code> call. |
-| EVENT_DESTROY | at the end of the <code>service</code> method in <code>SlingMainServlet</code> |</p>
+| EVENT_INIT | after entering the `service` method in `SlingMainServlet`. Note that this will be *after* the `handleSecurity` call. |
+| EVENT_DESTROY | at the end of the `service` method in `SlingMainServlet` |
       <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/request-parameters.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/request-parameters.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/request-parameters.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/request-parameters.html" target="sling_cwiki">/site/request-parameters.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Request Parameter Handling in Sling</h1>
       <h2 id="servlet-api">Servlet API</h2>
@@ -192,7 +194,7 @@
 Up to and including Sling Engine 2.2.2 request parameters are always decoded with ISO-8859-1 encoding if the `\*charset\*` request parameter is missing. As of Sling Engine 2.2.4 the `\*charset\*` request parameter is optional. As of this version the Sling Main Servlet supports a configuration setting which allows to change the default character encoding used if the `\*charset\*` request parameter is missing. To enable this functionality set the `sling.default.parameter.encoding` parameter of the Sling Main Servlet (PID `org.apache.sling.engine.impl.SlingMainServlet`) configuration to the desired encoding, which of course must be supported by the actual Java Platform.
 </div>
       <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/servlets.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.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/servlets.html" target="sling_cwiki">/site/servlets.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Servlets and Scripts</h1>
       <div class="toc">
@@ -196,10 +198,10 @@ servlets and describe their binding deta
 <p>The <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/">launchpad/integration-tests</a> module contains a number of tests (like the [ExtensionServletTest|http://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java] for example) that verify the results.</p>
 <p>Such tests run as part of our continuous integration process, to demonstrate and verify the behavior of the various servlet registration mechanisms, in a way that's guaranteed to be in sync with the actual Sling core code. If you have an idea for additional tests, make sure to let us know!</p>
 <h3 id="example-registration-by-path">Example: Registration by Path</h3>
-<div class="codehilite"><pre><span class="n">sling</span><span class="o">.</span><span class="n">servlet</span><span class="o">.</span><span class="n">paths</span> <span class="o">=</span> <span class="o">\</span><span class="p">[</span> <span class="s">&quot;/libs/sling/sample/html&quot;</span><span class="p">,</span> <span class="s">&quot;/libs/sling/sample/txt&quot;</span> <span class="o">\</span><span class="p">]</span>
-<span class="n">sling</span><span class="o">.</span><span class="n">servlet</span><span class="o">.</span><span class="n">resourceTypes</span> <span class="o">=</span> <span class="o">\</span><span class="p">[</span> <span class="s">&quot;sling/unused&quot;</span> <span class="o">\</span><span class="p">]</span>
-<span class="n">sling</span><span class="o">.</span><span class="n">servlet</span><span class="o">.</span><span class="n">selectors</span> <span class="o">=</span> <span class="o">\</span><span class="p">[</span> <span class="s">&quot;img&quot;</span> <span class="o">\</span><span class="p">]</span>
-<span class="n">sling</span><span class="o">.</span><span class="n">servlet</span><span class="o">.</span><span class="n">extensions</span> <span class="o">=</span> <span class="o">\</span><span class="p">[</span> <span class="s">&quot;html&quot;</span><span class="p">,</span> <span class="s">&quot;txt&quot;</span><span class="p">,</span> <span class="s">&quot;json&quot;</span> <span class="o">\</span><span class="p">]</span>
+<div class="codehilite"><pre><span class="n">sling</span><span class="p">.</span><span class="n">servlet</span><span class="p">.</span><span class="n">paths</span> <span class="p">=</span> <span class="o">\</span><span class="p">[</span> &quot;<span class="o">/</span><span class="n">libs</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">sample</span><span class="o">/</span><span class="n">html</span>&quot;<span class="p">,</span> &quot;<span class="o">/</span><span class="n">libs</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">sample</span><span class="o">/</span><span class="n">txt</span>&quot; <span class="o">\</span><span class="p">]</span>
+<span class="n">sling</span><span class="p">.</span><span class="n">servlet</span><span class="p">.</span><span class="n">resourceTypes</span> <span class="p">=</span> <span class="o">\</span><span class="p">[</span> &quot;<span class="n">sling</span><span class="o">/</span><span class="n">unused</span>&quot; <span class="o">\</span><span class="p">]</span>
+<span class="n">sling</span><span class="p">.</span><span class="n">servlet</span><span class="p">.</span><span class="n">selectors</span> <span class="p">=</span> <span class="o">\</span><span class="p">[</span> &quot;<span class="n">img</span>&quot; <span class="o">\</span><span class="p">]</span>
+<span class="n">sling</span><span class="p">.</span><span class="n">servlet</span><span class="p">.</span><span class="n">extensions</span> <span class="p">=</span> <span class="o">\</span><span class="p">[</span> &quot;<span class="n">html</span>&quot;<span class="p">,</span> &quot;<span class="n">txt</span>&quot;<span class="p">,</span> &quot;<span class="n">json</span>&quot; <span class="o">\</span><span class="p">]</span>
 </pre></div>
 
 
@@ -210,9 +212,9 @@ servlets and describe their binding deta
 </ul>
 <p>The registration properties <code>sling.servlet.resourceTypes</code>, <code>sling.servlet.selectors</code> and <code>sling.servlet.extensions</code> <em>are ignored</em> because the <code>sling.servlet.paths</code> property is set.</p>
 <h3 id="example-registration-by-resource-type-etc">Example: Registration by Resource Type etc.</h3>
-<div class="codehilite"><pre><span class="n">sling</span><span class="o">.</span><span class="n">servlet</span><span class="o">.</span><span class="n">resourceTypes</span> <span class="o">=</span> <span class="o">\</span><span class="p">[</span> <span class="s">&quot;sling/unused&quot;</span> <span class="o">\</span><span class="p">]</span>
-<span class="n">sling</span><span class="o">.</span><span class="n">servlet</span><span class="o">.</span><span class="n">selectors</span> <span class="o">=</span> <span class="o">\</span><span class="p">[</span> <span class="s">&quot;img&quot;</span><span class="p">,</span> <span class="s">&quot;tab&quot;</span> <span class="o">\</span><span class="p">]</span>
-<span class="n">sling</span><span class="o">.</span><span class="n">servlet</span><span class="o">.</span><span class="n">extensions</span> <span class="o">=</span> <span class="o">\</span><span class="p">[</span> <span class="s">&quot;html&quot;</span><span class="p">,</span> <span class="s">&quot;txt&quot;</span><span class="p">,</span> <span class="s">&quot;json&quot;</span> <span class="o">\</span><span class="p">]</span>
+<div class="codehilite"><pre><span class="n">sling</span><span class="p">.</span><span class="n">servlet</span><span class="p">.</span><span class="n">resourceTypes</span> <span class="p">=</span> <span class="o">\</span><span class="p">[</span> &quot;<span class="n">sling</span><span class="o">/</span><span class="n">unused</span>&quot; <span class="o">\</span><span class="p">]</span>
+<span class="n">sling</span><span class="p">.</span><span class="n">servlet</span><span class="p">.</span><span class="n">selectors</span> <span class="p">=</span> <span class="o">\</span><span class="p">[</span> &quot;<span class="n">img</span>&quot;<span class="p">,</span> &quot;<span class="n">tab</span>&quot; <span class="o">\</span><span class="p">]</span>
+<span class="n">sling</span><span class="p">.</span><span class="n">servlet</span><span class="p">.</span><span class="n">extensions</span> <span class="p">=</span> <span class="o">\</span><span class="p">[</span> &quot;<span class="n">html</span>&quot;<span class="p">,</span> &quot;<span class="n">txt</span>&quot;<span class="p">,</span> &quot;<span class="n">json</span>&quot; <span class="o">\</span><span class="p">]</span>
 </pre></div>
 
 
@@ -263,7 +265,7 @@ The mechanism helping the provider here 
 <h2 id="error-handler-servlets-or-scripts">Error Handler Servlet(s) or Scripts</h2>
 <p>Error handling support is now described on the <a href="/documentation/the-sling-engine/errorhandling.html">Errorhandling</a> page.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1483698 by bdelacretaz on Fri, 17 May 2013 08:57:57 +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/url-decomposition.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/url-decomposition.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/url-decomposition.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/url-decomposition.html" target="sling_cwiki">/site/url-decomposition.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>URL decomposition</h1>
       <p>During the <em>Resource Resolution</em> step, the client request URL is decomposed into the following parts:</p>
@@ -219,7 +221,7 @@
 The [SlingRequestPathInfoTest](http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/SlingRequestPathInfoTest.java) demonstrates and tests this decomposition. Feel free to suggest additional tests that help clarify how this works!
 </div>
       <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/wrap-or-decorate-resources.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.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/wrap-or-decorate-resources.html" target="sling_cwiki">/site/wrap-or-decorate-resources.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Wrap or Decorate Resources</h1>
       <h2 id="introduction">Introduction</h2>
@@ -97,7 +99,7 @@
 <div class="codehilite"><pre><span class="n">interface</span> <span class="n">ResourceDecorator</span> <span class="p">{</span>
     <span class="n">Resource</span> <span class="n">decorate</span><span class="p">(</span><span class="n">Resource</span><span class="p">)</span>
 
-    <span class="nv">@Deprecated</span>
+    <span class="p">@</span><span class="n">Deprecated</span>
     <span class="n">Resource</span> <span class="n">decorate</span><span class="p">(</span><span class="n">Resource</span><span class="p">,</span> <span class="n">HttpServletRequest</span><span class="p">)</span>
 <span class="p">}</span>
 </pre></div>
@@ -107,14 +109,14 @@
 If the service decorates the resource it should return the new resource. If the service does not want to decorate the resource, it should return the original resource or null. </p>
 <p>The two-argument <code>{decorate</code>} method will not be invoked, starting with version 2.1.0 of the JCR Resource bundle. Implementors of this interface targeting both newer and older versions of this bundle are advised to implement this method with:</p>
 <div class="codehilite"><pre>    <span class="n">public</span> <span class="n">Resource</span> <span class="n">decorate</span><span class="p">(</span><span class="n">Resource</span> <span class="n">resource</span><span class="p">,</span> <span class="n">HttpServletRequest</span> <span class="n">request</span><span class="p">)</span> <span class="p">{</span>
-        <span class="k">return</span> <span class="n">this</span><span class="o">.</span><span class="n">decorate</span><span class="p">(</span><span class="n">resource</span><span class="p">);</span>
+        <span class="k">return</span> <span class="n">this</span><span class="p">.</span><span class="n">decorate</span><span class="p">(</span><span class="n">resource</span><span class="p">);</span>
     <span class="p">}</span>
 </pre></div>
 
 
 <p>And use some other method (e.g. a <code>{ThreadLocal</code>}) to obtain the current request if necessary.</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/tutorials-how-tos.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos.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/tutorials-how-tos.html" target="sling_cwiki">/site/tutorials-how-tos.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Tutorials &amp; How-Tos</h1>
       <ul>
@@ -97,7 +99,7 @@
 <li><a href="/documentation/tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></li>
 </ul>
       <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/tutorials-how-tos/getting-resources-and-properties-in-sling.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-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/getting-resources-and-properties-in-sling.html" target="sling_cwiki">/site/getting-resources-and-properties-in-sling.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Getting Resources and Properties in Sling</h1>
       <p>The Resource is one of the central parts of Sling. Extending from JCR's Everything is Content, Sling assumes Everthing is a Resource. Thus Sling is maintaining a virtual tree of resources, which is a merger of the actual contents in the JCR Repository and resources provided by so called resource providers. By doing this Sling fits very well in the paradigm of the REST architecture.</p>
@@ -187,7 +189,7 @@
 
 <p>For more details about resources and how to access them in Sling, you can refer to the <a href="/documentation/the-sling-engine/resources.html">Sling documentation about Resources</a>.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1345850 by fmeschbe on Mon, 4 Jun 2012 07:40:42 +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/tutorials-how-tos/installing-and-upgrading-bundles.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.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/installing-and-upgrading-bundles.html" target="sling_cwiki">/site/installing-and-upgrading-bundles.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Installing and Upgrading Bundles</h1>
       <div class="note">
@@ -142,7 +144,7 @@ We recommend to use the Apache Felix Web
 
 <p>Note: Only use <code>file:</code> URLs if you know Sling has access to the named file !</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1464512 by bdelacretaz on Thu, 4 Apr 2013 13:03:31 +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/tutorials-how-tos/jackrabbit-persistence.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.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/jackrabbit-persistence.html" target="sling_cwiki">/site/jackrabbit-persistence.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Jackrabbit Persistence</h1>
       <p>Out-of-the-box the embedded Jackrabbit repository used by Sling (the Embedded Jackrabbit Repository bundle) uses Derby to persist the JCR nodes and properties. For some applications or environments it may be required or required to replace Derby with another backing store such as PostgreSQL or Oracle.</p>
@@ -104,8 +106,7 @@
 <ol>
 <li>Get the JDBC driver for your database from the driver provider</li>
 <li>
-<p>Wrap the JDBC driver library into an OSGi bundle:  <br />
-</p>
+<p>Wrap the JDBC driver library into an OSGi bundle:    </p>
 <div class="codehilite"><pre><span class="c"># Example for PostgreSQL JDBC 3 driver 8.4-701</span>
 <span class="nv">$ </span>java -jar bnd.jar wrap postgresql-8.4-701.jdbc3.jar
 <span class="nv">$ </span>mv postgresql-8.4-701.jdbc3.bar postgresql-8.4-701.jdbc3-bnd.jar
@@ -178,7 +179,7 @@ This needs to be reconfigured and restar
 <h2 id="credits">Credits</h2>
 <p>This description is based on Tony Giaccone's description <a href="http://markmail.org/message/wlbfrukmjjsl33hh">Swapping Postgres for Derby</a> sent to the Sling Users mailing list.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1345850 by fmeschbe on Mon, 4 Jun 2012 07:40:42 +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/guides.html
==============================================================================
--- websites/staging/sling/trunk/content/guides.html (original)
+++ websites/staging/sling/trunk/content/guides.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,27 +83,32 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/guides.html" target="sling_cwiki">/site/guides.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Guides</h1>
       <p>These pages contain further information in a more informal way.</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">Discover</span> <span class="n">Sling</span> <span class="n">in</span> <span class="mi">15</span> <span class="n">minutes</span> <span class="p">](</span><span class="sr">/documentation/g</span><span class="n">etting</span><span class="o">-</span><span class="n">started</span><span class="o">/</span><span class="n">discover</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">in</span><span class="o">-</span><span class="mi">15</span><span class="o">-</span><span class="n">minutes</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">-</span> <span class="n">title</span> <span class="n">says</span> <span class="n">it</span> <span class="n">all</span>
+<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">Discover</span> <span class="n">Sling</span> <span class="n">in</span> 15 <span class="n">minutes</span> <span class="p">](</span><span class="o">/</span><span class="n">documentation</span><span class="o">/</span><span class="n">getting</span><span class="o">-</span><span class="n">started</span><span class="o">/</span><span class="n">discover</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">in</span><span class="o">-</span>15<span class="o">-</span><span class="n">minutes</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">-</span> <span class="n">title</span> <span class="n">says</span> <span class="n">it</span> <span class="n">all</span>
 
-<span class="o">*</span> <span class="p">[</span><span class="n">Resources</span><span class="p">](</span><span class="sr">/documentation/</span><span class="n">the</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">engine</span><span class="o">/</span><span class="n">resources</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Presents</span> <span class="n">the</span> <span class="n">Resource</span> <span class="n">as</span> <span class="n">the</span> <span class="n">object</span> <span class="n">around</span> <span class="n">which</span> <span class="n">Sling</span> <span class="n">is</span> <span class="n">built</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Servlet</span> <span class="n">Resolution</span><span class="p">](</span><span class="sr">/old-stuff/s</span><span class="n">ervlet</span><span class="o">-</span><span class="n">resolution</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">How</span> <span class="n">Sling</span> <span class="n">resolves</span> <span class="n">the</span> <span class="n">servlet</span> <span class="ow">or</span> <span class="n">script</span> <span class="n">responsible</span> <span class="k">for</span> <span class="n">rendering</span> <span class="n">a</span> <span class="n">Resource</span><span class="o">.</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Request</span> <span class="n">Parameters</span><span class="p">](</span><span class="sr">/documentation/</span><span class="n">the</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">engine</span><span class="o">/</span><span class="n">request</span><span class="o">-</span><span class="n">parameters</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Explains</span> <span class="n">how</span> <span class="n">Sling</span> <span class="n">provides</span> <span class="n">request</span> <span class="n">parameters</span> <span class="n">to</span> <span class="n">servlets</span><span class="p">,</span> <span class="n">scripts</span> <span class="ow">and</span> <span class="n">filters</span><span class="o">.</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Repository</span> <span class="n">Based</span> <span class="n">Development</span><span class="p">](</span><span class="sr">/documentation/</span><span class="n">development</span><span class="o">/</span><span class="n">repository</span><span class="o">-</span><span class="n">based</span><span class="o">-</span><span class="n">development</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Shows</span> <span class="n">how</span> <span class="n">WebDAV</span> <span class="n">is</span> <span class="n">supported</span> <span class="n">by</span> <span class="n">Sling</span><span class="o">.</span>
+<span class="o">*</span> <span class="p">[</span><span class="n">Resources</span><span class="p">](</span><span class="o">/</span><span class="n">documentation</span><span class="o">/</span><span class="n">the</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">engine</span><span class="o">/</span><span class="n">resources</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Presents</span> <span class="n">the</span> <span class="n">Resource</span> <span class="n">as</span> <span class="n">the</span> <span class="n">object</span> <span class="n">around</span> <span class="n">which</span> <span class="n">Sling</span> <span class="n">is</span> <span class="n">built</span>
+<span class="o">*</span> <span class="p">[</span><span class="n">Servlet</span> <span class="n">Resolution</span><span class="p">](</span><span class="o">/</span><span class="n">old</span><span class="o">-</span><span class="n">stuff</span><span class="o">/</span><span class="n">servlet</span><span class="o">-</span><span class="n">resolution</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">How</span> <span class="n">Sling</span> <span class="n">resolves</span> <span class="n">the</span> <span class="n">servlet</span> <span class="n">or</span> <span class="n">script</span> <span class="n">responsible</span> <span class="k">for</span> <span class="n">rendering</span> <span class="n">a</span> <span class="n">Resource</span><span class="p">.</span>
+<span class="o">*</span> <span class="p">[</span><span class="n">Request</span> <span class="n">Parameters</span><span class="p">](</span><span class="o">/</span><span class="n">documentation</span><span class="o">/</span><span class="n">the</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">engine</span><span class="o">/</span><span class="n">request</span><span class="o">-</span><span class="n">parameters</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Explains</span> <span class="n">how</span> <span class="n">Sling</span> <span class="n">provides</span> <span class="n">request</span> <span class="n">parameters</span> <span class="n">to</span> <span class="n">servlets</span><span class="p">,</span> <span class="n">scripts</span> <span class="n">and</span> <span class="n">filters</span><span class="p">.</span>
+<span class="o">*</span> <span class="p">[</span><span class="n">Repository</span> <span class="n">Based</span> <span class="n">Development</span><span class="p">](</span><span class="o">/</span><span class="n">documentation</span><span class="o">/</span><span class="n">development</span><span class="o">/</span><span class="n">repository</span><span class="o">-</span><span class="n">based</span><span class="o">-</span><span class="n">development</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Shows</span> <span class="n">how</span> <span class="n">WebDAV</span> <span class="n">is</span> <span class="n">supported</span> <span class="n">by</span> <span class="n">Sling</span><span class="p">.</span>
 
-<span class="o">*</span> <span class="p">[</span><span class="n">Bundle</span> <span class="n">Management</span><span class="p">](</span><span class="sr">/documentation/</span><span class="n">tutorials</span><span class="o">-</span><span class="n">how</span><span class="o">-</span><span class="n">tos</span><span class="o">/</span><span class="n">installing</span><span class="o">-</span><span class="ow">and</span><span class="o">-</span><span class="n">upgrading</span><span class="o">-</span><span class="n">bundles</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Explains</span> <span class="n">how</span> <span class="n">to</span> <span class="n">install</span><span class="p">,</span> <span class="n">upgrade</span> <span class="ow">and</span> <span class="n">uninstall</span> <span class="n">Bundles</span> <span class="n">using</span> <span class="n">the</span> <span class="n">Sling</span> <span class="n">Manag
 ement</span> <span class="n">console</span><span class="o">.</span>
+<span class="o">*</span> <span class="p">[</span><span class="n">Bundle</span> <span class="n">Management</span><span class="p">](</span><span class="o">/</span><span class="n">documentation</span><span class="o">/</span><span class="n">tutorials</span><span class="o">-</span><span class="n">how</span><span class="o">-</span><span class="n">tos</span><span class="o">/</span><span class="n">installing</span><span class="o">-</span><span class="n">and</span><span class="o">-</span><span class="n">upgrading</span><span class="o">-</span><span class="n">bundles</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Explains</span> <span class="n">how</span> <span class="n">to</span> <span class="n">install</span><span class="p">,</span> <span class="n">upgrade</span> <span class="n">and</span> <span class="n">uninstall</span> <span class="n">Bundles</span> <span class="n">using</span> <span class="n">the</span> <span c
 lass="n">Sling</span> <span class="n">Management</span> <span class="n">console</span><span class="p">.</span>
 </pre></div>
 
 
 <p>These pages refer to the old Component API and launcher, and remain referred to here until more up to date documentation has been prepared:</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">Getting</span> <span class="ow">and</span> <span class="n">Building</span> <span class="n">Sling</span><span class="p">](</span><span class="sr">/documentation/</span><span class="n">development</span><span class="o">/</span><span class="n">getting</span><span class="o">-</span><span class="ow">and</span><span class="o">-</span><span class="n">building</span><span class="o">-</span><span class="n">sling</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">A</span> <span class="n">short</span> <span class="n">recount</span> <span class="n">on</span> <span class="n">the</span> <span class="n">first</span> <span class="n">step</span> <span class="k">for</span> <span class="n">getting</span> <span class="n">a</span> <span class="n">running</span> <span class="n">Sling</span> <span class="n">instance</span> <span class="n">af
 ter</span> <span class="n">checking</span> <span class="n">out</span> <span class="n">the</span> <span class="n">source</span> <span class="n">from</span> <span class="n">the</span> <span class="n">SVN</span> <span class="n">repository</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Default</span> <span class="n">Mapping</span> <span class="ow">and</span> <span class="n">Rendering</span><span class="p">](</span><span class="sr">/documentation/</span><span class="n">the</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">engine</span><span class="o">/</span><span class="n">default</span><span class="o">-</span><span class="n">mapping</span><span class="o">-</span><span class="ow">and</span><span class="o">-</span><span class="n">rendering</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Explains</span> <span class="n">default</span> <span class="n">mapping</span> <span class="n">of</span> <span class="n">repository</span> <span class="n">nodes</span> <span class="n">to</span> <span class="n">Content</span> <span class="n">instances</span> <span class="ow">and</span> <span class="
 n">selection</span> <span class="n">of</span> <span class="n">a</span> <span class="n">default</span> <span class="n">Component</span><span class="o">.</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Dispatching</span> <span class="n">Requests</span><span class="p">](</span><span class="sr">/documentation/</span><span class="n">the</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">engine</span><span class="o">/</span><span class="n">dispatching</span><span class="o">-</span><span class="n">requests</span><span class="o">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Explains</span> <span class="n">how</span> <span class="n">a</span> <span class="n">Component</span> <span class="n">may</span> <span class="n">dispatch</span> <span class="n">requests</span> <span class="n">to</span> <span class="n">include</span> <span class="n">further</span> <span class="n">content</span> <span class="n">renderings</span> <span class="n">in</span> <span class="n">the</span> <span class="n">response</span> <span class="n">to</span> 
 <span class="n">the</span> <span class="n">client</span><span class="err">&#39;</span><span class="n">s</span> <span class="n">request</span>
+<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">Getting</span> <span class="n">and</span> <span class="n">Building</span> <span class="n">Sling</span><span class="p">](</span><span class="o">/</span><span class="n">documentation</span><span class="o">/</span><span class="n">development</span><span class="o">/</span><span class="n">getting</span><span class="o">-</span><span class="n">and</span><span class="o">-</span><span class="n">building</span><span class="o">-</span><span class="n">sling</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">A</span> <span class="n">short</span> <span class="n">recount</span> <span class="n">on</span> <span class="n">the</span> <span class="n">first</span> <span class="n">step</span> <span class="k">for</span> <span class="n">getting</span> <span class="n">a</span> <span class="n">running</span> <span class="n">Sling</span> <span c
 lass="n">instance</span> <span class="n">after</span> <span class="n">checking</span> <span class="n">out</span> <span class="n">the</span> <span class="n">source</span> <span class="n">from</span> <span class="n">the</span> <span class="n">SVN</span> <span class="n">repository</span>
+<span class="o">*</span> <span class="p">[</span><span class="n">Default</span> <span class="n">Mapping</span> <span class="n">and</span> <span class="n">Rendering</span><span class="p">](</span><span class="o">/</span><span class="n">documentation</span><span class="o">/</span><span class="n">the</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">engine</span><span class="o">/</span><span class="n">default</span><span class="o">-</span><span class="n">mapping</span><span class="o">-</span><span class="n">and</span><span class="o">-</span><span class="n">rendering</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Explains</span> <span class="n">default</span> <span class="n">mapping</span> <span class="n">of</span> <span class="n">repository</span> <span class="n">nodes</span> <span class="n">to</span> <span class="n">Content</span> <span class="n">instances</span
 > <span class="n">and</span> <span class="n">selection</span> <span class="n">of</span> <span class="n">a</span> <span class="n">default</span> <span class="n">Component</span><span class="p">.</span>
+<span class="o">*</span> <span class="p">[</span><span class="n">Dispatching</span> <span class="n">Requests</span><span class="p">](</span><span class="o">/</span><span class="n">documentation</span><span class="o">/</span><span class="n">the</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">engine</span><span class="o">/</span><span class="n">dispatching</span><span class="o">-</span><span class="n">requests</span><span class="p">.</span><span class="n">html</span><span class="p">)</span> <span class="o">--</span> <span class="n">Explains</span> <span class="n">how</span> <span class="n">a</span> <span class="n">Component</span> <span class="n">may</span> <span class="n">dispatch</span> <span class="n">requests</span> <span class="n">to</span> <span class="n">include</span> <span class="n">further</span> <span class="n">content</span> <span class="n">renderings</span> <span class="n">in</span> <span class="n">the</span> <span class="
 n">response</span> <span class="n">to</span> <span class="n">the</span> <span class="n">client</span><span class="o">&#39;</span><span class="n">s</span> <span class="n">request</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +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