incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r868731 [3/6] - in /websites/staging/sling/trunk/content: ./ documentation/ documentation/bundles/ documentation/development/ documentation/getting-started/ documentation/the-sling-engine/ documentation/the-sling-engine/authentication/ docu...
Date Sun, 07 Jul 2013 18:50:12 GMT
Modified: websites/staging/sling/trunk/content/documentation/getting-started/discover-sling-in-15-minutes.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/getting-started/discover-sling-in-15-minutes.html (original)
+++ websites/staging/sling/trunk/content/documentation/getting-started/discover-sling-in-15-minutes.html Sun Jul  7 18:50:10 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"
@@ -117,7 +114,7 @@
 <p>A WebDAV client makes editing server-side scripts much more convenient, but to make our examples easy to reproduce, we're using cURL below to create and update files in the JCR repository, via the Sling WebDAV server.</p>
 <h2 id="start-the-launchpad">Start the Launchpad</h2>
 <p>After downloading the Sling Launchpad self-runnable jar just start it as follows:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">java</span> <span class="o">-</span><span class="n">jar</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">launchpad</span><span class="o">-</span><span class="mi">6</span><span class="o">-</span><span class="n">standalone</span><span class="o">.</span><span class="n">jar</span>
+<div class="codehilite"><pre>$ <span class="n">java</span> <span class="o">-</span><span class="n">jar</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">launchpad</span><span class="o">-</span>6<span class="o">-</span><span class="n">standalone</span><span class="p">.</span><span class="n">jar</span>
 </pre></div>
 
 
@@ -130,13 +127,13 @@ If things go wrong, have a look at the <
 <h2 id="create-some-content">Create some content</h2>
 <p>Until we have ready-to-test forms, you can create content with cURL, or you can create an HTML form that posts to the specified URL.</p>
 <p>To create a content node (nodes are a <a href="http://jackrabbit.apache.org/">JCR</a> concept, a unit of storage) with cURL, use:</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;sling:resourceType=foo/bar&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;title=some title&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/content/m</span><span class="n">ynode</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="n">sling</span><span class="p">:</span><span class="n">resourceType</span><span class="p">=</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="n">title</span><span class="p">=</span><span class="n">some</span> <span class="n">title</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">mynode</span>
 </pre></div>
 
 
 <p>The resulting node can be seen at <a href="http://localhost:8080/content/mynode.html.path">http://localhost:8080/content/mynode.html</a>, or as json format under <a href="http://localhost:8080/content/mynode.json">http://localhost:8080/content/mynode.json</a>. Lets try with cURL:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/content/m</span><span class="n">ynode</span><span class="o">.</span><span class="n">json</span>    
-<span class="p">{</span><span class="s">&quot;title&quot;</span><span class="p">:</span><span class="s">&quot;some title&quot;</span><span class="p">,</span><span class="s">&quot;sling:resourceType&quot;</span><span class="p">:</span><span class="s">&quot;foo/bar&quot;</span><span class="p">,</span><span class="s">&quot;jcr:primaryType&quot;</span><span class="p">:</span><span class="s">&quot;nt:unstructured&quot;</span><span class="p">}</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">mynode</span><span class="p">.</span><span class="n">json</span>    
+<span class="p">{</span>&quot;<span class="n">title</span>&quot;<span class="p">:</span>&quot;<span class="n">some</span> <span class="n">title</span>&quot;<span class="p">,</span>&quot;<span class="n">sling</span><span class="p">:</span><span class="n">resourceType</span>&quot;<span class="p">:</span>&quot;<span class="n">foo</span><span class="o">/</span><span class="n">bar</span>&quot;<span class="p">,</span>&quot;<span class="n">jcr</span><span class="p">:</span><span class="n">primaryType</span>&quot;<span class="p">:</span>&quot;<span class="n">nt</span><span class="p">:</span><span class="n">unstructured</span>&quot;<span class="p">}</span>
 </pre></div>
 
 
@@ -164,13 +161,13 @@ Sling provides a simple tool (an OSGi co
 <li>and appends <em>html.esp</em>, as the extension of our URL is <em>html</em> and the language of our script is <em>esp</em>.</li>
 </ul>
 <p>Store this script under <em>/apps/foo/bar/html.esp</em>, either using a WebDAV client (connected to <a href="http://admin:admin@localhost:8080/">http://admin:admin@localhost:8080/</a>), or using cURL as shown here, after creating the <em>html.esp</em> script in the current directory on your system:</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/apps/</span><span class="n">foo</span>
-<span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/apps/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">foo</span>
+<span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span>
 </pre></div>
 
 
 <p>create a local file <em>html.esp</em> and copy above content.</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">T</span> <span class="n">html</span><span class="o">.</span><span class="n">esp</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/apps/</span><span class="n">foo</span><span class="sr">/bar/</span><span class="n">html</span><span class="o">.</span><span class="n">esp</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">T</span> <span class="n">html</span><span class="p">.</span><span class="n">esp</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span><span class="o">/</span><span class="n">html</span><span class="p">.</span><span class="n">esp</span>
 </pre></div>
 
 
@@ -187,17 +184,17 @@ well as above in the <em>see also</em> s
 <p>To create a node with a unique path at a given location, end the URL of the POST request with <em>/</em>.</p>
 <p>In this case, the Sling response redirects to the URL of the created node.</p>
 <p>Start by creating a new <em>/blog</em> folder:</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">POST</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="s">&quot;http://localhost:8080/content/blog&quot;</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">POST</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> &quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">blog</span>&quot;
 </pre></div>
 
 
 <p>And create a node with a Sling-generated name under it:</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">D</span> <span class="o">-</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;title=Adventures with Sling&quot;</span> <span class="s">&quot;http://localhost:8080/content/blog/&quot;</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">D</span> <span class="o">-</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="n">title</span><span class="p">=</span><span class="n">Adventures</span> <span class="n">with</span> <span class="n">Sling</span>&quot; &quot;<span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">blog</span><span class="o">/</span>&quot;
 </pre></div>
 
 
 <p>Using cURL's <em>-D</em> option shows the full HTTP response, which includes a <em>Location</em> header to indicate where the new node was created:</p>
-<div class="codehilite"><pre><span class="n">Location:</span> <span class="sr">/blog/</span><span class="n">adventures_with_slin</span>
+<div class="codehilite"><pre><span class="n">Location</span><span class="p">:</span> <span class="o">/</span><span class="n">blog</span><span class="o">/</span><span class="n">adventures_with_slin</span>
 </pre></div>
 
 
@@ -219,20 +216,20 @@ well as above in the <em>see also</em> s
 
 
 <p>Upload it so that it is used to render resources having <em>sling:resourceType=foo/header</em>:</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/apps/</span><span class="n">foo</span><span class="sr">/header/</span>
-<span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">T</span> <span class="n">header</span><span class="o">.</span><span class="n">esp</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/apps/</span><span class="n">foo</span><span class="sr">/header/</span><span class="n">html</span><span class="o">.</span><span class="n">esp</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">header</span><span class="o">/</span>
+<span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">T</span> <span class="n">header</span><span class="p">.</span><span class="n">esp</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">header</span><span class="o">/</span><span class="n">html</span><span class="p">.</span><span class="n">esp</span>
 </pre></div>
 
 
 <p>Create the header node:</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;sling:resourceType=foo/header&quot;</span> <span class="o">\</span>    
-    <span class="o">-</span><span class="n">F</span><span class="s">&quot;headline=Hello, Sling world&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/content/</span><span class="n">header</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="n">sling</span><span class="p">:</span><span class="n">resourceType</span><span class="p">=</span><span class="n">foo</span><span class="o">/</span><span class="n">header</span>&quot; <span class="o">\</span>    
+    <span class="o">-</span><span class="n">F</span>&quot;<span class="n">headline</span><span class="p">=</span><span class="n">Hello</span><span class="p">,</span> <span class="n">Sling</span> <span class="n">world</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">header</span>
 </pre></div>
 
 
 <p>Upload the logo that the script uses (using sling.jpg or another logo in the current directory):</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/images/</span>
-<span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">T</span> <span class="n">sling</span><span class="o">.</span><span class="n">jpg</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/images/s</span><span class="n">ling</span><span class="o">.</span><span class="n">jpg</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">images</span><span class="o">/</span>
+<span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">T</span> <span class="n">sling</span><span class="p">.</span><span class="n">jpg</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">images</span><span class="o">/</span><span class="n">sling</span><span class="p">.</span><span class="n">jpg</span>
 </pre></div>
 
 
@@ -250,7 +247,7 @@ well as above in the <em>see also</em> s
 
 
 <p>And upload it again to replace the previous version:</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">T</span> <span class="n">html</span><span class="o">.</span><span class="n">esp</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/apps/</span><span class="n">foo</span><span class="sr">/bar/</span><span class="n">html</span><span class="o">.</span><span class="n">esp</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin</span><span class="p">:</span><span class="n">admin</span> <span class="o">-</span><span class="n">T</span> <span class="n">html</span><span class="p">.</span><span class="n">esp</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span><span class="o">/</span><span class="n">html</span><span class="p">.</span><span class="n">esp</span>
 </pre></div>
 
 

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 Sun Jul  7 18:50:10 2013
@@ -83,11 +83,6 @@
       </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>
@@ -118,7 +113,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. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
+        Rev. 1500501 by fmeschbe on Sun, 7 Jul 2013 18:49:51 +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/adapters.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/adapters.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/adapters.html Sun Jul  7 18:50:10 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"
@@ -92,26 +89,26 @@
 <p>To use resources as scripts, the <code>Resource.adaptTo</code> method must support being called with the <code>org.apache.sling.api.script.SlingScript</code> class object. But of course, we do not want to integrate the script manager with the resource resolver. To enable adapting objects to classes which are not foreseen by the original implementation, a factory mechanism is used. This way, the script manager can provide an adapter factory to adapt <code>Resource</code> to <code>SlingScript</code> objects.</p>
 <h2 id="adaptable">Adaptable</h2>
 <p>The <code>Adaptable</code> interface defines the API to be implemented by a class providing adaptability to another class. The single method defined by this interface is</p>
-<div class="codehilite"><pre>/**
- * Adapts the adaptable to another type.
- * <span class="nt">&lt;p&gt;</span>
- * Please not that it is explicitly left as an implementation detail whether
- * each call to this method with the same <span class="nt">&lt;code&gt;</span>type<span class="nt">&lt;/code&gt;</span> yields the same
- * object or a new object on each call.
- * <span class="nt">&lt;p&gt;</span>
- * Implementations of this method should document their adapted types as
- * well as their behaviour with respect to returning newly created or not
- * instance on each call.
- *
- * @param <span class="nt">&lt;AdapterType&gt;</span> The generic type to which this resource is adapted
- *            to
- * @param type The Class object of the target type, such as
- *            <span class="nt">&lt;code&gt;</span>javax.jcr.Node.class<span class="nt">&lt;/code&gt;</span> or
- *            <span class="nt">&lt;code&gt;</span>java.io.File.class<span class="nt">&lt;/code&gt;</span>
- * @return The adapter target or <span class="nt">&lt;code&gt;</span>null<span class="nt">&lt;/code&gt;</span> if the resource cannot
- *         adapt to the requested type
- */
-<span class="nt">&lt;AdapterType&gt;</span> AdapterType adaptTo(Class<span class="nt">&lt;AdapterType&gt;</span> type);
+<div class="codehilite"><pre><span class="cm">/**</span>
+<span class="cm"> * Adapts the adaptable to another type.</span>
+<span class="cm"> * &lt;p&gt;</span>
+<span class="cm"> * Please not that it is explicitly left as an implementation detail whether</span>
+<span class="cm"> * each call to this method with the same &lt;code&gt;type&lt;/code&gt; yields the same</span>
+<span class="cm"> * object or a new object on each call.</span>
+<span class="cm"> * &lt;p&gt;</span>
+<span class="cm"> * Implementations of this method should document their adapted types as</span>
+<span class="cm"> * well as their behaviour with respect to returning newly created or not</span>
+<span class="cm"> * instance on each call.</span>
+<span class="cm"> *</span>
+<span class="cm"> * @param &lt;AdapterType&gt; The generic type to which this resource is adapted</span>
+<span class="cm"> *            to</span>
+<span class="cm"> * @param type The Class object of the target type, such as</span>
+<span class="cm"> *            &lt;code&gt;javax.jcr.Node.class&lt;/code&gt; or</span>
+<span class="cm"> *            &lt;code&gt;java.io.File.class&lt;/code&gt;</span>
+<span class="cm"> * @return The adapter target or &lt;code&gt;null&lt;/code&gt; if the resource cannot</span>
+<span class="cm"> *         adapt to the requested type</span>
+<span class="cm"> */</span>
+<span class="o">&lt;</span><span class="n">AdapterType</span><span class="o">&gt;</span> <span class="n">AdapterType</span> <span class="n">adaptTo</span><span class="p">(</span><span class="n">Class</span><span class="o">&lt;</span><span class="n">AdapterType</span><span class="o">&gt;</span> <span class="k">type</span><span class="p">);</span>
 </pre></div>
 
 
@@ -125,31 +122,31 @@
 </ul>
 <h2 id="adapterfactory">AdapterFactory</h2>
 <p>The <code>AdapterFactory</code> interface defines the service interface and API for factories supporting extensible adapters for <code>SlingAdaptable</code> objects. The interface has a single method:</p>
-<div class="codehilite"><pre>/**
- * Adapt the given object to the adaptable type. The adaptable object is
- * guaranteed to be an instance of one of the classes listed in the
- * {@link #ADAPTABLE_CLASSES} services registration property. The type
- * parameter is one of the classes listed in the {@link #ADAPTER_CLASSES}
- * service registration properties.
- * <span class="nt">&lt;p&gt;</span>
- * This method may return <span class="nt">&lt;code&gt;</span>null<span class="nt">&lt;/code&gt;</span> if the adaptable object cannot
- * be adapted to the adapter (target) type for any reason. In this case, the
- * implementation should log a message to the log facility noting the cause
- * for not being able to adapt.
- * <span class="nt">&lt;p&gt;</span>
- * Note that the <span class="nt">&lt;code&gt;</span>adaptable<span class="nt">&lt;/code&gt;</span> object is not required to implement
- * the <span class="nt">&lt;code&gt;</span>Adaptable<span class="nt">&lt;/code&gt;</span> interface, though most of the time this method
- * is called by means of calling the {@link Adaptable#adaptTo(Class)}
- * method.
- *
- * @param <span class="nt">&lt;AdapterType&gt;</span> The generic type of the adapter (target) type.
- * @param adaptable The object to adapt to the adapter type.
- * @param type The type to which the object is to be adapted.
- * @return The adapted object or <span class="nt">&lt;code&gt;</span>null<span class="nt">&lt;/code&gt;</span> if this factory instance
- *         cannot adapt the object.
- */
-<span class="nt">&lt;AdapterType&gt;</span> AdapterType getAdapter(Object adaptable,
-        Class<span class="nt">&lt;AdapterType&gt;</span> type);
+<div class="codehilite"><pre><span class="cm">/**</span>
+<span class="cm"> * Adapt the given object to the adaptable type. The adaptable object is</span>
+<span class="cm"> * guaranteed to be an instance of one of the classes listed in the</span>
+<span class="cm"> * {@link #ADAPTABLE_CLASSES} services registration property. The type</span>
+<span class="cm"> * parameter is one of the classes listed in the {@link #ADAPTER_CLASSES}</span>
+<span class="cm"> * service registration properties.</span>
+<span class="cm"> * &lt;p&gt;</span>
+<span class="cm"> * This method may return &lt;code&gt;null&lt;/code&gt; if the adaptable object cannot</span>
+<span class="cm"> * be adapted to the adapter (target) type for any reason. In this case, the</span>
+<span class="cm"> * implementation should log a message to the log facility noting the cause</span>
+<span class="cm"> * for not being able to adapt.</span>
+<span class="cm"> * &lt;p&gt;</span>
+<span class="cm"> * Note that the &lt;code&gt;adaptable&lt;/code&gt; object is not required to implement</span>
+<span class="cm"> * the &lt;code&gt;Adaptable&lt;/code&gt; interface, though most of the time this method</span>
+<span class="cm"> * is called by means of calling the {@link Adaptable#adaptTo(Class)}</span>
+<span class="cm"> * method.</span>
+<span class="cm"> *</span>
+<span class="cm"> * @param &lt;AdapterType&gt; The generic type of the adapter (target) type.</span>
+<span class="cm"> * @param adaptable The object to adapt to the adapter type.</span>
+<span class="cm"> * @param type The type to which the object is to be adapted.</span>
+<span class="cm"> * @return The adapted object or &lt;code&gt;null&lt;/code&gt; if this factory instance</span>
+<span class="cm"> *         cannot adapt the object.</span>
+<span class="cm"> */</span>
+<span class="o">&lt;</span><span class="n">AdapterType</span><span class="o">&gt;</span> <span class="n">AdapterType</span> <span class="n">getAdapter</span><span class="p">(</span><span class="n">Object</span> <span class="n">adaptable</span><span class="p">,</span>
+        <span class="n">Class</span><span class="o">&lt;</span><span class="n">AdapterType</span><span class="o">&gt;</span> <span class="k">type</span><span class="p">);</span>
 </pre></div>
 
 
@@ -158,23 +155,23 @@
 <h2 id="adaptermanager">AdapterManager</h2>
 <p>The <code>AdapterManager</code> is defines the service interface for the generalized and extensible use of <code>AdapterFactory</code> services. Thus the adapter manager may be retrieved from the service registry to try to adapt whatever object that needs to be adapted - provided appropriate adapters exist.</p>
 <p>The <code>AdapterManager</code> interface is defined as follows:</p>
-<div class="codehilite"><pre>/**
- * Returns an adapter object of the requested <span class="nt">&lt;code&gt;</span>AdapterType<span class="nt">&lt;/code&gt;</span> for
- * the given <span class="nt">&lt;code&gt;</span>adaptable<span class="nt">&lt;/code&gt;</span> object.
- * <span class="nt">&lt;p&gt;</span>
- * The <span class="nt">&lt;code&gt;</span>adaptable<span class="nt">&lt;/code&gt;</span> object may be any non-<span class="nt">&lt;code&gt;</span>null<span class="nt">&lt;/code&gt;</span> object
- * and is not required to implement the <span class="nt">&lt;code&gt;</span>Adaptable<span class="nt">&lt;/code&gt;</span> interface.
- *
- * @param <span class="nt">&lt;AdapterType&gt;</span> The generic type of the adapter (target) type.
- * @param adaptable The object to adapt to the adapter type.
- * @param type The type to which the object is to be adapted.
- * @return The adapted object or <span class="nt">&lt;code&gt;</span>null<span class="nt">&lt;/code&gt;</span> if no factory exists to
- *         adapt the <span class="nt">&lt;code&gt;</span>adaptable<span class="nt">&lt;/code&gt;</span> to the <span class="nt">&lt;code&gt;</span>AdapterType<span class="nt">&lt;/code&gt;</span>
- *         or if the <span class="nt">&lt;code&gt;</span>adaptable<span class="nt">&lt;/code&gt;</span> cannot be adapted for any other
- *         reason.
- */
-<span class="nt">&lt;AdapterType&gt;</span> AdapterType getAdapter(Object adaptable,
-        Class<span class="nt">&lt;AdapterType&gt;</span> type);
+<div class="codehilite"><pre><span class="cm">/**</span>
+<span class="cm"> * Returns an adapter object of the requested &lt;code&gt;AdapterType&lt;/code&gt; for</span>
+<span class="cm"> * the given &lt;code&gt;adaptable&lt;/code&gt; object.</span>
+<span class="cm"> * &lt;p&gt;</span>
+<span class="cm"> * The &lt;code&gt;adaptable&lt;/code&gt; object may be any non-&lt;code&gt;null&lt;/code&gt; object</span>
+<span class="cm"> * and is not required to implement the &lt;code&gt;Adaptable&lt;/code&gt; interface.</span>
+<span class="cm"> *</span>
+<span class="cm"> * @param &lt;AdapterType&gt; The generic type of the adapter (target) type.</span>
+<span class="cm"> * @param adaptable The object to adapt to the adapter type.</span>
+<span class="cm"> * @param type The type to which the object is to be adapted.</span>
+<span class="cm"> * @return The adapted object or &lt;code&gt;null&lt;/code&gt; if no factory exists to</span>
+<span class="cm"> *         adapt the &lt;code&gt;adaptable&lt;/code&gt; to the &lt;code&gt;AdapterType&lt;/code&gt;</span>
+<span class="cm"> *         or if the &lt;code&gt;adaptable&lt;/code&gt; cannot be adapted for any other</span>
+<span class="cm"> *         reason.</span>
+<span class="cm"> */</span>
+<span class="o">&lt;</span><span class="n">AdapterType</span><span class="o">&gt;</span> <span class="n">AdapterType</span> <span class="n">getAdapter</span><span class="p">(</span><span class="n">Object</span> <span class="n">adaptable</span><span class="p">,</span>
+        <span class="n">Class</span><span class="o">&lt;</span><span class="n">AdapterType</span><span class="o">&gt;</span> <span class="k">type</span><span class="p">);</span>
 </pre></div>
 
 

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 Sun Jul  7 18:50:10 2013
@@ -83,41 +83,36 @@
       </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>
 <ul>
-<li><em><a href="#osgi">OSGi</a></em> --- The Sling application is built as a series of OSGi bundles and makes heavy use of a number of OSGi core and compendium services.</li>
-<li><em><a href="#sling-api">Sling API</a></em> --- To implement content based Web applications with Sling, an API has been defined, this extends the Servlet API and provides more functionality to work on the content.</li>
-<li><em><a href="#request-processing">Request Processing</a></em> --- Sling takes a unique approach to handling requests in that a request URL is first resolved to a resource, then based on the resource (and only the resource) it selects the actual servlet or script to handle the request.</li>
-<li><em><a href="#resources">Resources</a></em> --- The central mantra of Sling is the <em>Resource</em>, which represents the resource addressed by any request URL. It is the resource that is first resolved when handling a request. Based on the resource, a first servlet or script is then accessed to actually handle the request.</li>
-<li><em><a href="#servlets-and-scripts">Servlets and Scripts</a></em> --- Servlets and Scripts are handled uniformly in that they are represented as resources themselves and are accessible by a resource path.</li>
-<li><em><a href="#launchpad">Launchpad</a></em> --- Sling uses a very thin launcher to integrate with an existing servlet container, launching Sling as a Web application or providing a main class to represent a standalone Java application.</li>
+<li><strong><a href="#osgi">OSGi</a></strong> &mdash; The Sling application is built as a series of OSGi bundles and makes heavy use of a number of OSGi core and compendium services.</li>
+<li><strong><a href="#sling-api">Sling API</a></strong> &mdash; To implement content based Web applications with Sling, an API has been defined, this extends the Servlet API and provides more functionality to work on the content.</li>
+<li><strong><a href="#request-processing">Request Processing</a></strong> &mdash; Sling takes a unique approach to handling requests in that a request URL is first resolved to a resource, then based on the resource (and only the resource) it selects the actual servlet or script to handle the request.</li>
+<li><strong><a href="#resources">Resources</a></strong> &mdash; The central mantra of Sling is the <em>Resource</em>, which represents the resource addressed by any request URL. It is the resource that is first resolved when handling a request. Based on the resource, a first servlet or script is then accessed to actually handle the request.</li>
+<li><strong><a href="#servlets-and-scripts">Servlets and Scripts</a></strong> &mdash; Servlets and Scripts are handled uniformly in that they are represented as resources themselves and are accessible by a resource path.</li>
+<li><strong><a href="#launchpad">Launchpad</a></strong> &mdash; Sling uses a very thin launcher to integrate with an existing servlet container, launching Sling as a Web application or providing a main class to represent a standalone Java application.</li>
 </ul>
 <p>The following sections elaborate on each of these highlights.</p>
 <h2 id="osgi">OSGi</h2>
 <p><a href="http://www.osgi.org">OSGi</a> is a consortium that has developed a specification to build modular and extensible applications. This offers <a href="http://www.osgi.org/About/WhyOSGi">various benefits</a>. We deal mainly with two parts of the specifications: The Core Specification, which defines the OSGi Framework and Core Services, and the Compendium Services Specification, which defines a host of services that extend the functionality of the OSGi Framework.</p>
 <h3 id="osgi-framework">OSGi Framework</h3>
-<p>The OSGi Framework is made up of three layers -- Module, Lifecycle, and Services -- that define how extensible applications are built and deployed. The responsibilities of the layers are:</p>
+<p>The OSGi Framework is made up of three layers &ndash; Module, Lifecycle, and Services &ndash; that define how extensible applications are built and deployed. The responsibilities of the layers are:</p>
 <ul>
-<li><em>Module</em> --- Defines how a module, or a <em>Bundle</em> in OSGi-speak, is defined. Basically, a bundle is just a plain old JAR file, whose manifest file has some defined entries. These entries identify the bundle with a symbolic name, a version and more. In addition there are headers which define what a bundle provides <code>Export-Package</code> and what a bundle requires to be operative <code>Import-Package</code> and <code>Require-Bundle</code>.</li>
-<li><em>Lifecycle</em> --- The lifecycle layer defines the states a bundle may be in and describes the state changes. By providing a class, which implements the <code>BundleActivator</code> interface and which is named in the <code>Bundle-Activator</code> manifest header, a bundle may hook into the lifecycle process when the bundle is started and stopped.</li>
-<li><em>Services</em> --- For the application to be able to interact, the OSGi Core Specification defines the service layer. This describes a registry for services, which may be shared.</li>
+<li><strong>Module</strong> &mdash; Defines how a module, or a <em>Bundle</em> in OSGi-speak, is defined. Basically, a bundle is just a plain old JAR file, whose manifest file has some defined entries. These entries identify the bundle with a symbolic name, a version and more. In addition there are headers which define what a bundle provides <code>Export-Package</code> and what a bundle requires to be operative <code>Import-Package</code> and <code>Require-Bundle</code>.</li>
+<li><strong>Lifecycle</strong> &mdash; The lifecycle layer defines the states a bundle may be in and describes the state changes. By providing a class, which implements the <code>BundleActivator</code> interface and which is named in the <code>Bundle-Activator</code> manifest header, a bundle may hook into the lifecycle process when the bundle is started and stopped.</li>
+<li><strong>Services</strong> &mdash; For the application to be able to interact, the OSGi Core Specification defines the service layer. This describes a registry for services, which may be shared.</li>
 </ul>
 <h3 id="compendium-services">Compendium Services</h3>
 <p>Based on the OSGi Framework specification, the Compendium Services specification defines a (growing) number of extension services, which may be used by applications for various tasks. Of these Compendium Services, Sling is using just a small number:</p>
 <ul>
-<li><em>Log Service</em> --- Sling comes with its own implementation of the OSGi Log Service specification. The respective bundle not only provides this implementation, it also exports the SLF4J, Log4J and Commons Logging APIs needed for the Sling application to perform logging.</li>
-<li><em>Http Service</em> --- Sling leverages the OSGi Http Service to hook into a servlet container to provide the Web Application Framework mechanism.</li>
-<li><em>Configuration Admin Service</em> --- To simplify configuration of services in Sling, the OSGi Configuration Admin service is used. This provides a uniform API to configure services and to build configuration management agents.</li>
-<li><em>Metatype Service</em> --- The OSGi Metatype Service defines a way to describe the data types. Sling uses this service to describe the configurations that may be created using the Configuration Admin Service. These meta type descriptions are used by configuration management agents to present to user interface to manage the configurations.</li>
-<li><em>Event Admin Service</em> --- Sling uses the OSGi EventAdmin service to dispatch events when scheduling tasks.</li>
-<li><em>Declarative Services</em> --- One of the most important (beside the Log Service) services used by Sling is the Declarative Services Specification. This specification defines how to declaratively create components and services to have the Declarative Services runtime actually manage the lifecycle, configuration and references of components.</li>
+<li><strong>Log Service</strong> &mdash; Sling comes with its own implementation of the OSGi Log Service specification. The respective bundle not only provides this implementation, it also exports the SLF4J, Log4J and Commons Logging APIs needed for the Sling application to perform logging.</li>
+<li><strong>Http Service</strong> &mdash; Sling leverages the OSGi Http Service to hook into a servlet container to provide the Web Application Framework mechanism.</li>
+<li><strong>Configuration Admin Service</strong> &mdash; To simplify configuration of services in Sling, the OSGi Configuration Admin service is used. This provides a uniform API to configure services and to build configuration management agents.</li>
+<li><strong>Metatype Service</strong> &mdash; The OSGi Metatype Service defines a way to describe the data types. Sling uses this service to describe the configurations that may be created using the Configuration Admin Service. These meta type descriptions are used by configuration management agents to present to user interface to manage the configurations.</li>
+<li><strong>Event Admin Service</strong> &mdash; Sling uses the OSGi EventAdmin service to dispatch events when scheduling tasks.</li>
+<li><strong>Declarative Services</strong> &mdash; One of the most important (beside the Log Service) services used by Sling is the Declarative Services Specification. This specification defines how to declaratively create components and services to have the Declarative Services runtime actually manage the lifecycle, configuration and references of components.</li>
 </ul>
 <h2 id="sling-api">Sling API</h2>
 <p>The Sling API is an extension to the Servlet API which provides more functionality to interact with the Sling framework and also to extend Sling itself and to implement Sling applications.</p>
@@ -145,7 +140,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. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
+        Rev. 1500501 by fmeschbe on Sun, 7 Jul 2013 18:49:51 +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 Sun Jul  7 18:50:10 2013
@@ -83,26 +83,21 @@
       </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>
-<p>Let's look at generic request processing of Sling: Sling is linked into the outside world by registering the Sling Main Servlet -- implemented by the <code>SlingMainServlet</code> class in the Sling Engine bundle -- with an OSGi <code>HttpService</code>. This registration is accompanyied with an implementation instance of the OSGi <code>HttpContext</code> interface, which defines a method to authenticate requests: <code>handleSecurity</code>.</p>
+<p>Let's look at generic request processing of Sling: Sling is linked into the outside world by registering the Sling Main Servlet &ndash; implemented by the <code>SlingMainServlet</code> class in the Sling Engine bundle &ndash; with an OSGi <code>HttpService</code>. This registration is accompanyied with an implementation instance of the OSGi <code>HttpContext</code> interface, which defines a method to authenticate requests: <code>handleSecurity</code>.</p>
 <p>This method is called by the OSGi HTTP Service implementation after the servlet has been selected to handle the request but before actually calling the servlet's <code>service</code> method.</p>
-<p>{section}
-{column}
-<img alt="Authentication Flow" src="authentication.png" title="Authentication Flow" />
-{column}
-{column}
-1. First the OSGi HTTP Service implementation is analyzing the request URL to find a match for a servlet or resource registered with the HTTP Service.
-1. Now the HTTP Service implementation has to call the <code>handleSecurity</code> method of the <code>HttpContext</code> object with which the servlet or resource has been registered. This method returns <code>true</code> if the request should be serviced. If this method returns <code>false</code> the HTTP Service implementation terminates the request sending back any response which has been prepared by the <code>handleSecurity</code> method. Note, that the <code>handleSecurity</code> method must prepare the failure response sent to the client, the HTTP Service adds nothing here. If the <code>handleSecurity</code> method is successful, it must add two (or three) request attributes described below.
-1. When the <code>handleSecurity</code> method returns <code>true</code> the HTTP Service either calls the <code>Servlet.service</code> method or sends back the requested resource depending on whether a servlet or a resource has been selected in the first step.
+<p><a href="authentication.png" style="float:left;padding-right:5%;width:30%;">
+    <img src="authentication.png" title="Authentication Flow" alt="Authentication Flow" width="30%">
+</a></p>
+<ol>
+<li>First the OSGi HTTP Service implementation is analyzing the request URL to find a match for a servlet or resource registered with the HTTP Service.</li>
+<li>Now the HTTP Service implementation has to call the <code>handleSecurity</code> method of the <code>HttpContext</code> object with which the servlet or resource has been registered. This method returns <code>true</code> if the request should be serviced. If this method returns <code>false</code> the HTTP Service implementation terminates the request sending back any response which has been prepared by the <code>handleSecurity</code> method. Note, that the <code>handleSecurity</code> method must prepare the failure response sent to the client, the HTTP Service adds nothing here. If the <code>handleSecurity</code> method is successful, it must add two (or three) request attributes described below.</li>
+<li>When the <code>handleSecurity</code> method returns <code>true</code> the HTTP Service either calls the <code>Servlet.service</code> method or sends back the requested resource depending on whether a servlet or a resource has been selected in the first step.
 {column}
-{section}</p>
+{section}</li>
+</ol>
 <p>The important thing to note here is, that at the time the <code>handleSecurity</code> method is called, the <code>SlingMainServlet</code> is not yet in control of the request. So any functionality added by the <code>SlingMainServlet</code>, notably the <code>SlingHttpServletRequest</code> and <code>SlingHttpServletResponse</code> objects are not available to the implementation of the <code>handleSecurity</code> method.</p>
 <p>The following pages describe the full details of request authentication in Sling in full detail:</p>
 <ul>
@@ -112,7 +107,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. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
+        Rev. 1500501 by fmeschbe on Sun, 7 Jul 2013 18:49:51 +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/authentication-actors.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html Sun Jul  7 18:50:10 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"

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler.html Sun Jul  7 18:50:10 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"
@@ -139,7 +136,7 @@
 </tr>
 </tbody>
 </table>
-<p>When looking for an <code>AuthenticationHandler</code> the authentication handler is selected whose path is the longest match on the request URL. If the service is registered with Scheme and Host/Port, these must exactly match for the service to be eligible. If multiple <code>AuthenticationHandler</code> services are registered with the same length matching path, the handler with the higher service ranking is selected<sup id="fnref:ranking"><a href="#fn:ranking" rel="footnote">1</a></sup>.</p>
+<p>When looking for an <code>AuthenticationHandler</code> the authentication handler is selected whose path is the longest match on the request URL. If the service is registered with Scheme and Host/Port, these must exactly match for the service to be eligible. If multiple <code>AuthenticationHandler</code> services are registered with the same length matching path, the handler with the higher service ranking is selected<sup id="fnref:ranking"><a class="footnote-ref" href="#fn:ranking" rel="footnote">1</a></sup>.</p>
 <p>The value of <code>path</code> service registration property value triggering the call to any of the <code>AuthenticationHandler</code> methods is available as the <code>path</code> request attribute (for the time of the method call only). If the service is registered with multiple path values, the value of the <code>path</code> request attribute may be used to implement specific handling.</p>
 <h3 id="implementations-provided-by-sling">Implementations provided by Sling</h3>
 <ul>
@@ -164,7 +161,7 @@
 <hr />
 <ol>
 <li id="fn:ranking">
-<p>Service ranking is defined by the OSGi Core Specification as follows: <em>If multiple qualifying service interfaces exist, a service with the highest <code>service.ranking</code> number, or when equal to the lowest <code>service.id</code>, determines which service object is returned by the Framework</em>.&#160;<a href="#fnref:ranking" rev="footnote" title="Jump back to footnote 1 in the text">&#8617;</a></p>
+<p>Service ranking is defined by the OSGi Core Specification as follows: <em>If multiple qualifying service interfaces exist, a service with the highest <code>service.ranking</code> number, or when equal to the lowest <code>service.id</code>, determines which service object is returned by the Framework</em>.&#160;<a class="footnote-backref" href="#fnref:ranking" rev="footnote" title="Jump back to footnote 1 in the text">&#8617;</a></p>
 </li>
 </ol>
 </div>

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html Sun Jul  7 18:50:10 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"
@@ -174,7 +171,7 @@
 <p>The Form Based Authentication Handler contains a <a href="http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java">default form servlet</a> and <a href="http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/form/src/main/resources/org/apache/sling/auth/form/impl/login.html">HTML form template</a>.</p>
 <h3 id="phase-2-authenticated-requests">Phase 2: Authenticated Requests</h3>
 <p>After the successful authentication of the user in phase 1, the authentication state is stored in a Cookie or an HTTP Session. The stored value is a security token with the following contents:</p>
-<div class="codehilite"><pre><span class="n">HmacSHA1</span><span class="p">(</span><span class="n">securetoken</span><span class="p">,</span> <span class="sr">&lt;securetokennumber&gt;&lt;expirytime&gt;</span><span class="nv">@</span><span class="err">&lt;</span><span class="nv">userID</span><span class="o">&gt;</span><span class="p">)</span><span class="nv">@</span><span class="err">&lt;</span><span class="nv">securetokennumber</span><span class="o">&gt;</span><span class="sr">&lt;expirytime&gt;</span><span class="nv">@</span><span class="err">&lt;</span><span class="nv">userID</span><span class="o">&gt;</span>
+<div class="codehilite"><pre><span class="n">HmacSHA1</span><span class="p">(</span><span class="n">securetoken</span><span class="p">,</span> <span class="o">&lt;</span><span class="n">securetokennumber</span><span class="o">&gt;&lt;</span><span class="n">expirytime</span><span class="o">&gt;</span><span class="p">@</span><span class="o">&lt;</span><span class="n">userID</span><span class="o">&gt;</span><span class="p">)@</span><span class="o">&lt;</span><span class="n">securetokennumber</span><span class="o">&gt;&lt;</span><span class="n">expirytime</span><span class="o">&gt;</span><span class="p">@</span><span class="o">&lt;</span><span class="n">userID</span><span class="o">&gt;</span>
 </pre></div>
 
 

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html Sun Jul  7 18:50:10 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"

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-framework.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-framework.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-framework.html Sun Jul  7 18:50:10 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"
@@ -180,7 +177,7 @@
 </tbody>
 </table>
 <p><strong>NOTE</strong>: Do <em>NOT</em> use the <code>javax.jcr.Session</code> request attribute in your Sling applications. This attribute must be considered implementation specific to convey the JCR Session to the <code>SlingMainServlet</code>. In future versions of the Sling Commons Auth bundle, this request attribute will not be present anymore. To get the JCR Session for the current request adapt the request's resource resolver to a JCR Session:</p>
-<div class="codehilite"><pre><span class="n">Session</span> <span class="n">session</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getResourceResolver</span><span class="p">()</span><span class="o">.</span><span class="n">adaptTo</span><span class="p">(</span><span class="n">Session</span><span class="o">.</span><span class="n">class</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">Session</span> <span class="n">session</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getResourceResolver</span><span class="p">().</span><span class="n">adaptTo</span><span class="p">(</span><span class="n">Session</span><span class="p">.</span><span class="n">class</span><span class="p">);</span>
 </pre></div>
 
 

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-tasks.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-tasks.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-tasks.html Sun Jul  7 18:50:10 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"

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 Sun Jul  7 18:50:10 2013
@@ -83,118 +83,128 @@
       </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>
 <p>The following steps should give you an overview how a request is processed in Sling. Details can be found under provided links.</p>
-<h3 id="step-1">Step 1</h3>
+<ol>
+<li>
 <p>The client sends the request</p>
-<h3 id="step-2">Step 2</h3>
-<p>This step applies only if a Servlet Container is installed and Sling is embedded:
-Servlet Container gets request and forwards to OSGi HttpService</p>
-<h3 id="step-3">Step 3</h3>
+</li>
+<li>
+<p>This step applies only if a Servlet Container is installed and Sling is embedded: Servlet Container gets request and forwards to OSGi HttpService</p>
+</li>
+<li>
 <p>OSGi HttpService looks for responsible registered Servlet or resource (see 102.4 of the OSGi compendium)</p>
-<h3 id="step-4">Step 4</h3>
+</li>
+<li>
 <p>OSGi HttpService calls <code>handleSecurity</code> of the HttpContext associated with the servlet/resource. In case of Sling this calls into SlingMainServlet.handleSecurity and then into SlingAuthenticator.authenticate</p>
-<h3 id="step-4a">Step 4a</h3>
+<ol>
+<li>
 <p>SlingAuthenticator selects an authentication handler for the request and forwards the authenticate call. On success a <code>javax.jcr.Session</code> is created, the request attributes required by the HTTP Service spec are set (like <code>org.osgi.service.http.authentication.remote.user</code> and <code>org.osgi.service.http.authentication.type</code>and also the <code>javax.jcr.Session</code> which is used later is set in the request attributes.
 On success, continue with step 5.</p>
-<h3 id="step-4b">Step 4b</h3>
+</li>
+<li>
 <p>If authentication fails either an anonymous session is acquired (if anonymous is allowed per configuration) or the login method is called.
 If anonymous is allowed, continue with step 5.</p>
-<h3 id="step-4c">Step 4c</h3>
+</li>
+<li>
 <p>The login method selects an AuthenticationHandler and forwards the login call to the AuthenticationHandler.requestAuthentication method to cause the client to authenticate. Request processing stops here (<code>SlingMainServlet.handleSecurity</code> returns false).</p>
-<h3 id="step-5">Step 5</h3>
+</li>
+</ol>
+</li>
+<li>
 <p>After getting a response the HttpService either terminates the request (if authentication failed and <code>SlingMainServlet.handleSecurity</code> returned false) or continues by either spooling the resource or in the case of Sling calling the <code>SlingMainServlet.service</code> method.</p>
-<h3 id="step-6">Step 6</h3>
-<p>The <code>SlingMainServlet.service</code> method is the entry point into the Sling proper. This method sets up the request:
-<em> Wraps the <code>HttpServletRequest</code> and the <code>HttpServletResponse</code> into the <code>SlingHttpServletRequest</code> and the <code>SlingHttpServletResponse</code>
-</em> Checks if Sling is ready for processing the request (checks at the moment for an existing ResourceResolverFactory service, a ServletResolver service and a MimeTypeService)
-<em> Create the ResourceResolver based on the Session (by default creates a <code>JcrResourceResolver2</code>)
-</em> Locate the <a href="/documentation/the-sling-engine/resources.html">Resource</a> on the basis of the request by calling <code>ResourceResovler.resolve</code> through <code>RequestData.initResource</code> (see also [URL decomposition])
-* Locate the servlet or script (see <a href="/documentation/the-sling-engine/servlets.html">Servlets</a>) by calling <code>ServletResolver.resolveServlet</code> through <code>RequestData.initServlet</code></p>
-<h3 id="step-7">Step 7</h3>
+</li>
+<li>
+<p>The <code>SlingMainServlet.service</code> method is the entry point into the Sling proper. This method sets up the request:</p>
+<ul>
+<li>Wraps the <code>HttpServletRequest</code> and the <code>HttpServletResponse</code> into the <code>SlingHttpServletRequest</code> and the <code>SlingHttpServletResponse</code></li>
+<li>Checks if Sling is ready for processing the request (checks at the moment for an existing ResourceResolverFactory service, a ServletResolver service and a MimeTypeService)</li>
+<li>Create the ResourceResolver based on the Session (by default creates a <code>JcrResourceResolver2</code>)</li>
+<li>Locate the <a href="/documentation/the-sling-engine/resources.html">Resource</a> on the basis of the request by calling <code>ResourceResovler.resolve</code> through <code>RequestData.initResource</code> (see also <a href="/documentation/the-sling-engine/url-decomposition.html">URL decomposition</a>)</li>
+<li>Locate the servlet or script (see <a href="/documentation/the-sling-engine/servlets.html">Servlets</a>) by calling <code>ServletResolver.resolveServlet</code> through <code>RequestData.initServlet</code></li>
+</ul>
+</li>
+<li>
 <p>After this setup, the request level filters are called (the ones registered as <code>javax.servlet.Filter</code> with the property <code>filter.scope=request</code>, see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details).
 If any called filter doesn't call <code>FilterChain.doFilter</code> at the end of the <code>Filter.doFilter</code> method request processing stops here.</p>
-<h3 id="step-8">Step 8</h3>
+</li>
+<li>
 <p>After having called all request level filters, the component level filters (registered with the property <code>filter.scope=component</code>, see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details) are called.</p>
-<h3 id="step-9">Step 9</h3>
+</li>
+<li>
 <p>After having called the component level filters, the request servlet or script is finally called to process the request.</p>
+</li>
+</ol>
 <h2 id="includeforward">Include/Forward</h2>
 <p>If a servlet or script is including another resource for processing through the <code>RequestDispatcher.include</code> or <code>RequestDispatcher.forward</code> (or any JSP or feature of another scripting language which relies on one of this two methods) the following processing takes place:</p>
-<h3 id="step-1_1">Step 1</h3>
+<ol>
+<li>
 <p>Code in the processing servlet or script calls <code>RequestDispatcher.include</code> or <code>RequestDispatcher.forward</code>.</p>
-<h3 id="step-2_1">Step 2</h3>
+</li>
+<li>
 <p>The resource is resolved though ResourceResolver.getResource (if the RequestDispatcher has not been created with a resource already)</p>
-<h3 id="step-3_1">Step 3</h3>
+</li>
+<li>
 <p>The servlet or script to handle the resource is resolved calling the <code>ServletResolver.resolverServlet</code> method.</p>
-<h3 id="step-4_1">Step 4</h3>
+</li>
+<li>
 <p>The component level filters (registered with the property <code>filter.scope=component</code>) are called again (see <a href="/documentation/the-sling-engine/filters.html">Filters</a> for details).</p>
-<h3 id="step-5_1">Step 5</h3>
+</li>
+<li>
 <p>The servlet or script is called to process the request.</p>
+</li>
+</ol>
 <p>Note that these steps are processed for every include or forward call.</p>
 <h2 id="included-request-attributes">Included Request Attributes</h2>
 <p>When servlet or script is called as a result of <code>RequestDispatcher.include</code> the following request attributes are set:</p>
 <table>
 <thead>
 <tr>
-<th>Attribute Name</th>
-<th>Attribute Type</th>
+<th>Attribute Name <br> Attribute Type</th>
 <th>Description</th>
 </tr>
 </thead>
 <tbody>
 <tr>
-<td><code>org.apache.sling.api.include.servlet</code></td>
-<td><code>javax.servlet.Servlet</code></td>
+<td><code>org.apache.sling.api.include.servlet</code> <br> <code>javax.servlet.Servlet</code></td>
 <td>The name of the request attribute containing the <code>Servlet</code> which included the servlet currently being active.</td>
 </tr>
 <tr>
-<td><code>org.apache.sling.api.include.resource</code></td>
-<td><code>org.apache.sling.api.resource.Resource</code></td>
+<td><code>org.apache.sling.api.include.resource</code> <br><code>org.apache.sling.api.resource.Resource</code></td>
 <td>The name of the request attribute containing the <code>Resource</code> underlying the <code>Servlet</code> which included the servlet currently being active.</td>
 </tr>
 <tr>
-<td><code>org.apache.sling.api.include.request*path*info</code></td>
-<td><code>org.apache.sling.api.request.RequestPathInfo</code></td>
+<td><code>org.apache.sling.api.include.request_path_info</code> <br> <code>org.apache.sling.api.request.RequestPathInfo</code></td>
 <td>The name of the request attribute containing the <code>RequestPathInfo</code> underlying the <code>Servlet</code> which included the servlet currently being active</td>
 </tr>
 <tr>
-<td><code>javax.servlet.include.request_uri</code></td>
-<td><code>String</code></td>
-<td>The name of the request attribute containing the <code>HttpServletRequest.getRequestURI()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><em>Note:</em> In Sling, the <code>HttpServletRequest.getRequestURI()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
+<td><code>javax.servlet.include.request_uri</code> <br> <code>String</code></td>
+<td>The name of the request attribute containing the <code>HttpServletRequest.getRequestURI()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getRequestURI()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
 </tr>
 <tr>
-<td><code>javax.servlet.include.context_path</code></td>
-<td><code>String</code></td>
-<td>The name of the request attribute containing the <code>HttpServletRequest.getContextPath()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><em>Note:</em> In Sling, the <code>HttpServletRequest.getContextPath()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
+<td><code>javax.servlet.include.context_path</code> <br> <code>String</code></td>
+<td>The name of the request attribute containing the <code>HttpServletRequest.getContextPath()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getContextPath()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
 </tr>
 <tr>
-<td><code>javax.servlet.include.servlet_path</code></td>
-<td><code>String</code></td>
-<td>The name of the request attribute containing the <code>HttpServletRequest.getServletPath()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><em>Note:</em> In Sling, the <code>HttpServletRequest.getServletPath()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
+<td><code>javax.servlet.include.servlet_path</code> <br> <code>String</code></td>
+<td>The name of the request attribute containing the <code>HttpServletRequest.getServletPath()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getServletPath()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
 </tr>
 <tr>
-<td><code>javax.servlet.include.path_info</code></td>
-<td><code>String</code></td>
-<td>The name of the request attribute containing the <code>HttpServletRequest.getPathInfo()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><em>Note:</em> In Sling, the <code>HttpServletRequest.getPathInfo()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
+<td><code>javax.servlet.include.path_info</code> <br> <code>String</code></td>
+<td>The name of the request attribute containing the <code>HttpServletRequest.getPathInfo()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getPathInfo()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
 </tr>
 <tr>
-<td><code>javax.servlet.include.query_string</code></td>
-<td><code>String</code></td>
-<td>The name of the request attribute containing the <code>HttpServletRequest.getQueryString()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><em>Note:</em> In Sling, the <code>HttpServletRequest.getQueryString()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
+<td><code>javax.servlet.include.query_string</code> <br> <code>String</code></td>
+<td>The name of the request attribute containing the <code>HttpServletRequest.getQueryString()</code> of the request which included the servlet currently being active underlying the <code>Servlet</code> which included the servlet currently being active.<br><strong>Note:</strong> In Sling, the <code>HttpServletRequest.getQueryString()</code> method will always return the same result regardless of whether it is called from the client request processing servlet or script or from an included servlet or script. This request attribute is set for compatibility with the Servlet API specification.</td>
 </tr>
 </tbody>
 </table>
 <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>
+<p><strong>Note:</strong> 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. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
+        Rev. 1500501 by fmeschbe on Sun, 7 Jul 2013 18:49:51 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project



Mime
View raw message