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 [5/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/index.html
==============================================================================
--- websites/staging/sling/trunk/content/index.html (original)
+++ websites/staging/sling/trunk/content/index.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/index.html" target="sling_cwiki">/site/index.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Apache Sling - Bringing Back the Fun!</h1>
       <p><strong>Apache Sling&trade;</strong> is an innovative web framework that is intended to
@@ -198,7 +200,7 @@ such as <a href="http://www.eclipse.org/
         });
 </script>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1470853 by bdelacretaz on Tue, 23 Apr 2013 08:49:30 +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/links.html
==============================================================================
--- websites/staging/sling/trunk/content/links.html (original)
+++ websites/staging/sling/trunk/content/links.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/links.html" target="sling_cwiki">/site/links.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Links</h1>
       <p>Here are some links to other resources</p>
@@ -135,7 +137,7 @@
 <li><a href="http://www.osgi.org">The OSGi Alliance</a> - The OSGi Alliance is the specification body defining the OSGi Core and Compendium Services. These specifications are at the center of making Sling possible.</li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475862 by dklco on Thu, 25 Apr 2013 17:28:38 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/media.html
==============================================================================
--- websites/staging/sling/trunk/content/media.html (original)
+++ websites/staging/sling/trunk/content/media.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,13 +83,18 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/media.html" target="sling_cwiki">/site/media.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Media</h1>
       <p>This page holds all media required for the Apache Sling website. The media are attachments and can be addressed using the following URL: http://cwiki.apache.org/SLINGxSITE/media.data/ (followed by the actual name of the attachment).</p>
 <p>Currently, some of these attachments are used by the overall site template (only visible/editable by Confluence administrators).</p>
 <p>{attachments}</p>
       <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

Modified: websites/staging/sling/trunk/content/old-stuff.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff.html (original)
+++ websites/staging/sling/trunk/content/old-stuff.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/old-stuff.html" target="sling_cwiki">/site/old-stuff.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Old Stuff</h1>
       <p>Should either be deleted or reviewed and updated to match the current code:</p>
@@ -99,7 +101,7 @@
 <li><a href="/old-stuff/sling-api.html">Sling API</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +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/old-stuff/assembly.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/assembly.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/assembly.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/assembly.html" target="sling_cwiki">/site/assembly.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Assembly</h1>
       <p>{panel}
@@ -130,10 +132,10 @@ The Assembly concept grew out of a need 
 <h3 id="bundle-installation">Bundle Installation</h3>
 <p>When an Assembly is installed into the framework, the <em>Assembly Manager</em> checks to see whether the Assembly needs to be deployed. This is done by checking the bundles listed in the <code>Assembly-Bundles</code> header whether they are installed or not. All bundles not installed will be installed and started if requested so.</p>
 <p>The following BNF defines the syntax =Assembly-Bundles= header value:</p>
-<div class="codehilite"><pre><span class="n">Assembly</span><span class="o">-</span><span class="n">Bundles</span> <span class="o">=</span> <span class="n">Bundle</span> <span class="p">{</span> <span class="s">&quot;,&quot;</span> <span class="n">Bundle</span> <span class="p">}</span> <span class="o">.</span>
-<span class="n">Bundle</span> <span class="o">=</span> <span class="n">Symbolic</span><span class="o">-</span><span class="n">Name</span> <span class="p">{</span> <span class="s">&quot;;&quot;</span> <span class="n">Parameter</span> <span class="p">}</span> <span class="o">.</span>
-<span class="n">Symbolic</span><span class="o">-</span><span class="n">Name</span> <span class="o">=</span> <span class="sr">//</span> <span class="n">The</span> <span class="n">Bundle</span> <span class="n">symbolic</span> <span class="n">name</span> 
-<span class="n">Parameter</span> <span class="o">=</span> <span class="n">ParameterName</span> <span class="s">&quot;=&quot;</span> <span class="n">ParameterValue</span> <span class="o">.</span>
+<div class="codehilite"><pre><span class="n">Assembly</span><span class="o">-</span><span class="n">Bundles</span> <span class="p">=</span> <span class="n">Bundle</span> <span class="p">{</span> &quot;<span class="p">,</span>&quot; <span class="n">Bundle</span> <span class="p">}</span> <span class="p">.</span>
+<span class="n">Bundle</span> <span class="p">=</span> <span class="n">Symbolic</span><span class="o">-</span><span class="n">Name</span> <span class="p">{</span> &quot;<span class="p">;</span>&quot; <span class="n">Parameter</span> <span class="p">}</span> <span class="p">.</span>
+<span class="n">Symbolic</span><span class="o">-</span><span class="n">Name</span> <span class="p">=</span> <span class="o">//</span> <span class="n">The</span> <span class="n">Bundle</span> <span class="n">symbolic</span> <span class="n">name</span> 
+<span class="n">Parameter</span> <span class="p">=</span> <span class="n">ParameterName</span> &quot;<span class="p">=</span>&quot; <span class="n">ParameterValue</span> <span class="p">.</span>
 </pre></div>
 
 
@@ -170,7 +172,7 @@ The Assembly concept grew out of a need 
 <h3 id="nomen-est-omen">Nomen est Omen</h3>
 <p>The symbolic name of a bundle should reflect its contents. A bundle should generally only contain a single subtree in the virtual package tree. The symbolic name of the bundle should be the root package contained within. For example, consider a bundle containing the packages <code>org.apache.sling.sample</code>, <code>org.apache.sling.sample.impl</code>, <code>org.apache.sling.more</code>. The bundle would the be named <code>org.apache.sling.sample</code>.</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/old-stuff/launch-sling.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/launch-sling.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/launch-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,11 +83,16 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/launch-sling.html" target="sling_cwiki">/site/launch-sling.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Launch Sling</h1>
       <p>Please refer to <a href="/documentation/the-sling-engine/the-sling-launchpad.html">The Sling Launchpad</a> for up-to-date information on launching Sling.</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/old-stuff/request-processing.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/request-processing.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/request-processing.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-processing.html" target="sling_cwiki">/site/request-processing.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Request Processing</h1>
       <div class="note">
@@ -166,57 +168,57 @@ used have to be registered as services u
 <p>It is crucial to understand that <code>Content</code> is an interface and the request processor of Sling does not actually care, how the <code>Content</code> instance comes to live as long as the is such an object and there is a <code>Component</code> instance capable of servicing the <code>Content</code> object.</p>
 <p>By default Sling uses the <em>URL Mapper</em> to resolve the request URL into a <code>Content</code> object. When a <code>Component</code> is tasked with servicing a <code>Content</code> object it usually uses the <code>ComponentRequestDispatcher</code> to ask Sling to service another content object generally identified by a (relative or absolute) path to a JCR Repository Node from which the <code>Content</code> object is loaded.</p>
 <p>But instead of having Sling resolve a path into a <code>Content</code> object the component may just as well create a <code>Content</code> object and hand it over to the <code>ComponentRequestDispatcher</code> for service. Consider a request which is handled by a <code>PageComponent</code>. This component has to draw a navigation tree somewhere in the response. So the component could of course insist on having a <code>navigation</code> child node to dispatch rendering to as follows:</p>
-<div class="codehilite"><pre><span class="n">RequestDispatcher</span> <span class="n">rd</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getRequestDispatcher</span><span class="p">(</span><span class="s">&quot;navigation&quot;</span><span class="p">);</span>
-<span class="n">rd</span><span class="o">.</span><span class="n">include</span><span class="p">(</span><span class="n">request</span><span class="p">,</span> <span class="n">response</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">RequestDispatcher</span> <span class="n">rd</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getRequestDispatcher</span><span class="p">(</span>&quot;<span class="n">navigation</span>&quot;<span class="p">);</span>
+<span class="n">rd</span><span class="p">.</span><span class="n">include</span><span class="p">(</span><span class="n">request</span><span class="p">,</span> <span class="n">response</span><span class="p">);</span>
 </pre></div>
 
 
 <p>What happens, though, if there is no <code>navigation</code> child node ? Probably, the request will fail with some error status. Of course the component could be more clever and do:</p>
-<div class="codehilite"><pre><span class="n">Content</span> <span class="n">navigation</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getContent</span><span class="p">(</span><span class="s">&quot;navigation&quot;</span><span class="p">);</span>
-<span class="k">if</span> <span class="p">(</span><span class="n">navigation</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">RequestDispatcher</span> <span class="n">rd</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getRequestDispatcher</span><span class="p">(</span><span class="n">navigation</span><span class="p">);</span>
-    <span class="n">rd</span><span class="o">.</span><span class="n">include</span><span class="p">(</span><span class="n">request</span><span class="p">,</span> <span class="n">response</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">Content</span> <span class="n">navigation</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getContent</span><span class="p">(</span>&quot;<span class="n">navigation</span>&quot;<span class="p">);</span>
+<span class="k">if</span> <span class="p">(</span><span class="n">navigation</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
+    <span class="n">RequestDispatcher</span> <span class="n">rd</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getRequestDispatcher</span><span class="p">(</span><span class="n">navigation</span><span class="p">);</span>
+    <span class="n">rd</span><span class="p">.</span><span class="n">include</span><span class="p">(</span><span class="n">request</span><span class="p">,</span> <span class="n">response</span><span class="p">);</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <p>Still, if the <code>navigation</code> child node does not exist, there is no navigation drawn; at least there will be now error. Since Sling does not actually care, how a <code>Content</code> object comes to live, the component could do the following:</p>
-<div class="codehilite"><pre><span class="n">Content</span> <span class="n">navigation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Content</span><span class="p">()</span> <span class="p">{</span>
+<div class="codehilite"><pre><span class="n">Content</span> <span class="n">navigation</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Content</span><span class="p">()</span> <span class="p">{</span>
     <span class="n">public</span> <span class="n">String</span> <span class="n">getPath</span><span class="p">()</span> <span class="p">{</span>
-        <span class="k">return</span> <span class="n">request</span><span class="o">.</span><span class="n">getContent</span><span class="p">()</span><span class="o">.</span><span class="n">getPath</span><span class="p">()</span> <span class="o">+</span> <span class="s">&quot;/navigation&quot;</span><span class="p">;</span>
+        <span class="k">return</span> <span class="n">request</span><span class="p">.</span><span class="n">getContent</span><span class="p">().</span><span class="n">getPath</span><span class="p">()</span> <span class="o">+</span> &quot;<span class="o">/</span><span class="n">navigation</span>&quot;<span class="p">;</span>
     <span class="p">}</span>
     <span class="n">public</span> <span class="n">String</span> <span class="n">getComponentId</span><span class="p">()</span> <span class="p">{</span>
-        <span class="k">return</span> <span class="n">NavigationComponent</span><span class="o">.</span><span class="n">getClass</span><span class="p">()</span><span class="o">.</span><span class="n">getName</span><span class="p">();</span>
+        <span class="k">return</span> <span class="n">NavigationComponent</span><span class="p">.</span><span class="n">getClass</span><span class="p">().</span><span class="n">getName</span><span class="p">();</span>
     <span class="p">}</span>
 <span class="p">}</span>
 
-<span class="n">RequestDispatcher</span> <span class="n">rd</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getRequestDispatcher</span><span class="p">(</span><span class="n">navigation</span><span class="p">);</span>
-<span class="n">rd</span><span class="o">.</span><span class="n">include</span><span class="p">(</span><span class="n">request</span><span class="p">,</span> <span class="n">response</span><span class="p">);</span>
+<span class="n">RequestDispatcher</span> <span class="n">rd</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getRequestDispatcher</span><span class="p">(</span><span class="n">navigation</span><span class="p">);</span>
+<span class="n">rd</span><span class="p">.</span><span class="n">include</span><span class="p">(</span><span class="n">request</span><span class="p">,</span> <span class="n">response</span><span class="p">);</span>
 </pre></div>
 
 
 <p>Of course, the page component now has to have knowledge about the actual <code>Component</code> to use.</p>
 <p>Finally, as a further enhancement, the Component might even decide to first check for a <code>navigation</code> child node. If such a node does not exist the navigation <code>Content</code> object is just created:</p>
-<div class="codehilite"><pre><span class="n">Content</span> <span class="n">navigation</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getContent</span><span class="p">(</span><span class="s">&quot;navigation&quot;</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">Content</span> <span class="n">navigation</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getContent</span><span class="p">(</span>&quot;<span class="n">navigation</span>&quot;<span class="p">);</span>
 <span class="k">if</span> <span class="p">(</span><span class="n">navigation</span> <span class="o">==</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-    <span class="n">navigation</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Content</span><span class="p">()</span> <span class="p">{</span>
+    <span class="n">navigation</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Content</span><span class="p">()</span> <span class="p">{</span>
         <span class="n">public</span> <span class="n">String</span> <span class="n">getPath</span><span class="p">()</span> <span class="p">{</span>
-            <span class="k">return</span> <span class="n">request</span><span class="o">.</span><span class="n">getContent</span><span class="p">()</span><span class="o">.</span><span class="n">getPath</span><span class="p">()</span> <span class="o">+</span> <span class="s">&quot;/navigation&quot;</span><span class="p">;</span>
+            <span class="k">return</span> <span class="n">request</span><span class="p">.</span><span class="n">getContent</span><span class="p">().</span><span class="n">getPath</span><span class="p">()</span> <span class="o">+</span> &quot;<span class="o">/</span><span class="n">navigation</span>&quot;<span class="p">;</span>
         <span class="p">}</span>
         <span class="n">public</span> <span class="n">String</span> <span class="n">getComponentId</span><span class="p">()</span> <span class="p">{</span>
-            <span class="k">return</span> <span class="n">NavigationComponent</span><span class="o">.</span><span class="n">getClass</span><span class="p">()</span><span class="o">.</span><span class="n">getName</span><span class="p">();</span>
+            <span class="k">return</span> <span class="n">NavigationComponent</span><span class="p">.</span><span class="n">getClass</span><span class="p">().</span><span class="n">getName</span><span class="p">();</span>
         <span class="p">}</span>
     <span class="p">}</span>
 <span class="p">}</span>
 
-<span class="n">RequestDispatcher</span> <span class="n">rd</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getRequestDispatcher</span><span class="p">(</span><span class="n">navigation</span><span class="p">);</span>
-<span class="n">rd</span><span class="o">.</span><span class="n">include</span><span class="p">(</span><span class="n">request</span><span class="p">,</span> <span class="n">response</span><span class="p">);</span>
+<span class="n">RequestDispatcher</span> <span class="n">rd</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getRequestDispatcher</span><span class="p">(</span><span class="n">navigation</span><span class="p">);</span>
+<span class="n">rd</span><span class="p">.</span><span class="n">include</span><span class="p">(</span><span class="n">request</span><span class="p">,</span> <span class="n">response</span><span class="p">);</span>
 </pre></div>
 
 
 <p>This could for example be used to fall back to a default navigation setup while providing for specialized navigation configuration in an optional <code>navigation</code> child node.</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/old-stuff/scriptengineintegration.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/scriptengineintegration.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/scriptengineintegration.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/scriptengineintegration.html" target="sling_cwiki">/site/scriptengineintegration.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Integrating Scripting Languages</h1>
       <p>This page should be extended with more concrete and detailed information. For now, we have the following information:</p>
@@ -104,7 +106,7 @@
 <li><a href="/old-stuff/scriptengineintegration/xslt-processing-pipeline.html">XSLT Processing Pipeline</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1432954 by fmeschbe on Mon, 14 Jan 2013 15:33:43 +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/old-stuff/scriptengineintegration/groovy-support.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/scriptengineintegration/groovy-support.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/scriptengineintegration/groovy-support.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/groovy-support.html" target="sling_cwiki">/site/groovy-support.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Groovy Support</h1>
       <p>After meeting Paul King of the Groovy Team at Apache Con US 08 in New Orleans, I set out to take a stab at SLING-315 again to add Groovy support to Sling. It turned out, that the current Groovy 1.6 branch already contains the required setup to build the <code>groovy-all.jar</code> as an OSGi Bundle, which is directly usable with Sling by just installing that bundle.</p>
@@ -94,7 +96,7 @@
 <p>If you want to be on verge of development, you might want to go for Groovy 1.7: The second SNAPSHOT of beta-1 also contains the required headers and classes and may as well be used unmodified in Sling. You may download it here: <code>[groovy-all-1.7-beta-1-20081210.120632-2.jar]()</code>.</p>
 <p>To deploy the bundle go to the Bundles page, for example at http://localhost:8888/system/console/bundles of the Apache Felix Web Console select the bundle file to upload, check the <em>Start</em> check box and click <em>Install or Update</em> button.</p>
 <p>You may check, whether the Groovy ScriptEngine has been "accepted" by Sling, by going to the Script Engines page of the Apache Felix Web Console. You should see the entry for Groovy there, somthing like this:</p>
-<div class="codehilite"><pre><span class="n">Groovy</span> <span class="n">Scripting</span> <span class="n">Engine</span><span class="p">,</span> <span class="mf">2.0</span>
+<div class="codehilite"><pre><span class="n">Groovy</span> <span class="n">Scripting</span> <span class="n">Engine</span><span class="p">,</span> 2<span class="p">.</span>0
   <span class="n">Language</span>      <span class="n">Groovy</span><span class="p">,</span>
   <span class="n">Extensions</span>    <span class="n">groovy</span>
   <span class="n">MIME</span> <span class="n">Types</span>    <span class="n">application</span><span class="o">/</span><span class="n">x</span><span class="o">-</span><span class="n">groovy</span>
@@ -114,20 +116,20 @@ println &quot;You requested the Resource
 
 
 <p>and upload it to the repository as <code>/apps/nt/folder/GET.groovy</code> using your favourite WebDAV client or use curl to upload the file (assuming Sling is running on localhost:8888) :</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">FGET</span><span class="o">.</span><span class="n">groovy</span><span class="o">=</span><span class="nv">@GET</span><span class="o">.</span><span class="n">groovy</span> <span class="o">-</span><span class="n">F</span><span class="o">..</span><span class="sr">/../</span><span class="n">nt</span><span class="sr">/jcr:primaryType=sling:Folder http:host:8888/</span><span class="n">apps</span><span class="sr">/nt/</span><span class="n">folder</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">FGET</span><span class="p">.</span><span class="n">groovy</span><span class="p">=@</span><span class="n">GET</span><span class="p">.</span><span class="n">groovy</span> <span class="o">-</span><span class="n">F</span><span class="p">.</span><span class="o">./</span><span class="p">.</span><span class="o">./</span><span class="n">nt</span><span class="o">/</span><span class="n">jcr</span><span class="p">:</span><span class="n">primaryType</span><span class="p">=</span><span class="n">sling</span><span class="p">:</span><span class="n">Folder</span> <span class="n">http</span><span class="p">:</span><span class="n">host</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">nt</span><span cl
 ass="o">/</span><span class="n">folder</span>
 </pre></div>
 
 
 <p>To test it create a <code>/sample</code> <code>nt:Folder</code> node using your favourite WebDAV client or use curl again:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">u</span> <span class="n">admin:admin</span> <span class="o">-</span><span class="n">Fjcr:primaryType</span><span class="o">=</span><span class="n">nt:folder</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8888</span><span class="o">/</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">Fjcr</span><span class="p">:</span><span class="n">primaryType</span><span class="p">=</span><span class="n">nt</span><span class="p">:</span><span class="n">folder</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span>
 </pre></div>
 
 
 <p>Finally, request the <code>/sample</code> node using your favourite Browser or use curl again:</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:8888</span><span class="o">/</span><span class="n">sample</span>
-<span class="n">Hello</span> <span class="n">World</span> <span class="o">!</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>8888<span class="o">/</span><span class="n">sample</span>
+<span class="n">Hello</span> <span class="n">World</span> !
 <span class="n">This</span> <span class="n">is</span> <span class="n">Groovy</span> <span class="n">Speaking</span>
-<span class="n">You</span> <span class="n">requested</span> <span class="n">Resource</span> <span class="n">JcrNodeResource</span><span class="p">,</span> <span class="n">type</span><span class="o">=</span><span class="n">nt:folder</span><span class="p">,</span> <span class="n">path</span><span class="o">=/</span><span class="n">sample</span> <span class="p">(</span><span class="n">yes</span><span class="p">,</span> <span class="n">this</span> <span class="n">is</span> <span class="n">a</span> <span class="n">GString</span><span class="p">)</span>
+<span class="n">You</span> <span class="n">requested</span> <span class="n">Resource</span> <span class="n">JcrNodeResource</span><span class="p">,</span> <span class="n">type</span><span class="p">=</span><span class="n">nt</span><span class="p">:</span><span class="n">folder</span><span class="p">,</span> <span class="n">path</span><span class="p">=</span><span class="o">/</span><span class="n">sample</span> <span class="p">(</span><span class="n">yes</span><span class="p">,</span> <span class="n">this</span> <span class="n">is</span> <span class="n">a</span> <span class="n">GString</span><span class="p">)</span>
 </pre></div>
 
 
@@ -138,7 +140,7 @@ println &quot;You requested the Resource
 <li><a href="">Groovy in Apache Sling</a> -- Thread on adding the <code>DynamicImport-Package</code> header to the Groovy bundle manifest.</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/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/scriptengineintegration/xslt-processing-pipeline.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/scriptengineintegration/xslt-processing-pipeline.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,11 +83,16 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/xslt-processing-pipeline.html" target="sling_cwiki">/site/xslt-processing-pipeline.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>XSLT Processing Pipeline</h1>
       
       <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/old-stuff/servlet-resolution.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/servlet-resolution.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/servlet-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/servlet-resolution.html" target="sling_cwiki">/site/servlet-resolution.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Servlet Resolution</h1>
       <div class="warning">
@@ -154,10 +156,10 @@ Please see the new [Servlets](/documenta
 </ol>
 <p>Each path to be used for registration -- either from the <code>sling.servlet.paths</code> property or constructed from the other <code>sling.servlet.*</code> properties -- must be absolute. Any relative path is made absolute by prefixing it with a root path. This prefix may be set with the <code>sling.servlet.prefix</code> service registration property. If this property is not set, the first entry in the <code>ResourceResolver</code> search path for the <code>ResourceResolver.getResource(String)</code> method is used as the prefix. If this entry cannot be derived, a simpe slash -- <code>/</code> -- is used as the prefix.</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="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="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="p">[</span> <span class="s">&quot;sling/unused&quot;</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="p">[</span> <span class="s">&quot;img&quot;</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="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="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="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="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="p">[</span> &quot;<span class="n">sling</span><span class="o">/</span><span class="n">unused</span>&quot; <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="p">[</span> &quot;<span class="n">img</span>&quot; <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="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="p">]</span>
 </pre></div>
 
 
@@ -168,9 +170,9 @@ Please see the new [Servlets](/documenta
 </ul>
 <p>The registration properties <code>sling.servlet.resourceTypes</code>, <code>sling.servlet.selectors</code> and <code>sling.servlet.extensions</code> are ignored 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="p">[</span> <span class="s">&quot;sling/unused&quot;</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="p">[</span> <span class="s">&quot;img&quot;</span><span class="p">,</span> <span class="s">&quot;tab&quot;</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="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="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="p">[</span> &quot;<span class="n">sling</span><span class="o">/</span><span class="n">unused</span>&quot; <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="p">[</span> &quot;<span class="n">img</span>&quot;<span class="p">,</span> &quot;<span class="n">tab</span>&quot; <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="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="p">]</span>
 </pre></div>
 
 
@@ -201,44 +203,44 @@ Please see the new [Servlets](/documenta
 <p>The pseudo-code for Servlet resolution is as follows:</p>
 <div class="codehilite"><pre><span class="n">Servlet</span> <span class="n">resolveServlet</span><span class="p">(</span><span class="n">SlingHttpServletRequest</span> <span class="n">request</span><span class="p">)</span> <span class="p">{</span>
 
-    <span class="n">String</span> <span class="n">resourceType</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getResource</span><span class="p">()</span><span class="o">.</span><span class="n">getResourceType</span><span class="p">();</span>
-    <span class="n">resourceType</span> <span class="o">=</span> <span class="n">resourceType</span><span class="o">.</span><span class="n">replaceAll</span><span class="p">(</span><span class="s">&quot;\\:&quot;</span><span class="p">,</span> <span class="s">&quot;/&quot;</span><span class="p">);</span>
+    <span class="n">String</span> <span class="n">resourceType</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getResource</span><span class="p">().</span><span class="n">getResourceType</span><span class="p">();</span>
+    <span class="n">resourceType</span> <span class="p">=</span> <span class="n">resourceType</span><span class="p">.</span><span class="n">replaceAll</span><span class="p">(</span>&quot;<span class="o">\\</span><span class="p">:</span>&quot;<span class="p">,</span> &quot;<span class="o">/</span>&quot;<span class="p">);</span>
 
     <span class="n">String</span> <span class="n">baseName</span><span class="p">;</span>
-    <span class="k">if</span> <span class="p">((</span><span class="s">&quot;GET&quot;</span><span class="o">.</span><span class="n">equals</span><span class="p">(</span><span class="n">request</span><span class="o">.</span><span class="n">getMethod</span><span class="p">())</span> <span class="o">||</span> <span class="s">&quot;HEAD&quot;</span><span class="o">.</span><span class="n">equals</span><span class="p">(</span><span class="n">request</span><span class="o">.</span><span class="n">getMethod</span><span class="p">())</span>
-            <span class="o">&amp;&amp;</span> <span class="n">request</span><span class="o">.</span><span class="n">getRequestPathInfo</span><span class="p">()</span><span class="o">.</span><span class="n">getExtension</span><span class="p">()</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-        <span class="n">baseName</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getRequestPathInfo</span><span class="p">()</span><span class="o">.</span><span class="n">getExtension</span><span class="p">();</span>
+    <span class="k">if</span> <span class="p">((</span>&quot;<span class="n">GET</span>&quot;<span class="p">.</span><span class="n">equals</span><span class="p">(</span><span class="n">request</span><span class="p">.</span><span class="n">getMethod</span><span class="p">())</span> <span class="o">||</span> &quot;<span class="n">HEAD</span>&quot;<span class="p">.</span><span class="n">equals</span><span class="p">(</span><span class="n">request</span><span class="p">.</span><span class="n">getMethod</span><span class="p">())</span>
+            <span class="o">&amp;&amp;</span> <span class="n">request</span><span class="p">.</span><span class="n">getRequestPathInfo</span><span class="p">().</span><span class="n">getExtension</span><span class="p">()</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
+        <span class="n">baseName</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getRequestPathInfo</span><span class="p">().</span><span class="n">getExtension</span><span class="p">();</span>
     <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-        <span class="n">baseName</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getMethod</span><span class="p">();</span>
+        <span class="n">baseName</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getMethod</span><span class="p">();</span>
     <span class="p">}</span>
 
-    <span class="k">if</span> <span class="p">(</span><span class="n">request</span><span class="o">.</span><span class="n">getRequestPath</span><span class="p">()</span><span class="o">.</span><span class="n">getSelectorString</span><span class="p">()</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-        <span class="n">String</span> <span class="n">selectors</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getRequestPath</span><span class="p">()</span><span class="o">.</span><span class="n">getSelectorString</span><span class="p">();</span>
-        <span class="n">selectors</span> <span class="o">=</span> <span class="n">selectors</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s">&#39;.&#39;</span><span class="p">,</span> <span class="s">&#39;/&#39;</span><span class="p">);</span>
-        <span class="k">while</span> <span class="p">(</span><span class="n">selectors</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
-            <span class="n">String</span> <span class="n">path</span> <span class="o">=</span> <span class="n">resourceType</span> <span class="o">+</span> <span class="s">&quot;/&quot;</span> <span class="o">+</span> <span class="n">selectors</span> <span class="o">+</span> <span class="s">&quot;/&quot;</span> <span class="o">+</span> <span class="n">baseName</span><span class="p">;</span>
-            <span class="n">Servlet</span> <span class="n">servlet</span> <span class="o">=</span> <span class="n">findServletFor</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">servlet</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
+    <span class="k">if</span> <span class="p">(</span><span class="n">request</span><span class="p">.</span><span class="n">getRequestPath</span><span class="p">().</span><span class="n">getSelectorString</span><span class="p">()</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
+        <span class="n">String</span> <span class="n">selectors</span> <span class="p">=</span> <span class="n">request</span><span class="p">.</span><span class="n">getRequestPath</span><span class="p">().</span><span class="n">getSelectorString</span><span class="p">();</span>
+        <span class="n">selectors</span> <span class="p">=</span> <span class="n">selectors</span><span class="p">.</span><span class="n">replace</span><span class="p">(</span><span class="s">&#39;.&#39;</span><span class="p">,</span> <span class="s">&#39;/&#39;</span><span class="p">);</span>
+        <span class="k">while</span> <span class="p">(</span><span class="n">selectors</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
+            <span class="n">String</span> <span class="n">path</span> <span class="p">=</span> <span class="n">resourceType</span> <span class="o">+</span> &quot;<span class="o">/</span>&quot; <span class="o">+</span> <span class="n">selectors</span> <span class="o">+</span> &quot;<span class="o">/</span>&quot; <span class="o">+</span> <span class="n">baseName</span><span class="p">;</span>
+            <span class="n">Servlet</span> <span class="n">servlet</span> <span class="p">=</span> <span class="n">findServletFor</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">servlet</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span>
                 <span class="k">return</span> <span class="n">servlet</span><span class="p">;</span>
             <span class="p">}</span>
 
-            <span class="nb">int</span> <span class="n">lastSlash</span> <span class="o">=</span> <span class="n">selectors</span><span class="o">.</span><span class="n">lastIndexOf</span><span class="p">(</span><span class="s">&#39;/&#39;</span><span class="p">);</span>
-            <span class="k">if</span> <span class="p">(</span><span class="n">lastSlash</span> <span class="o">&gt;</span> <span class="mi">0</span><span class="p">)</span> <span class="p">{</span>
-                <span class="n">selectors</span> <span class="o">=</span> <span class="n">selectors</span><span class="o">.</span><span class="n">substring</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">lastSlash</span><span class="p">);</span>
+            <span class="n">int</span> <span class="n">lastSlash</span> <span class="p">=</span> <span class="n">selectors</span><span class="p">.</span><span class="n">lastIndexOf</span><span class="p">(</span><span class="s">&#39;/&#39;</span><span class="p">);</span>
+            <span class="k">if</span> <span class="p">(</span><span class="n">lastSlash</span> <span class="o">&gt;</span> 0<span class="p">)</span> <span class="p">{</span>
+                <span class="n">selectors</span> <span class="p">=</span> <span class="n">selectors</span><span class="p">.</span><span class="n">substring</span><span class="p">(</span>0<span class="p">,</span> <span class="n">lastSlash</span><span class="p">);</span>
             <span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
-                <span class="n">selectors</span> <span class="o">=</span> <span class="n">null</span><span class="p">;</span>
+                <span class="n">selectors</span> <span class="p">=</span> <span class="n">null</span><span class="p">;</span>
             <span class="p">}</span>
         <span class="p">}</span>
     <span class="p">}</span>
 
-    <span class="n">String</span> <span class="n">path</span> <span class="o">=</span> <span class="n">resourceType</span> <span class="o">+</span> <span class="s">&quot;/&quot;</span> <span class="o">+</span> <span class="n">baseName</span><span class="p">;</span>
+    <span class="n">String</span> <span class="n">path</span> <span class="p">=</span> <span class="n">resourceType</span> <span class="o">+</span> &quot;<span class="o">/</span>&quot; <span class="o">+</span> <span class="n">baseName</span><span class="p">;</span>
     <span class="k">return</span> <span class="n">findScriptFor</span><span class="p">(</span><span class="n">path</span><span class="p">);</span>
 <span class="p">}</span>
 
 <span class="n">Servlet</span> <span class="n">findScriptFor</span><span class="p">(</span><span class="n">path</span><span class="p">)</span> <span class="p">{</span>
-    <span class="sr">//</span> <span class="n">Find</span> <span class="n">a</span> <span class="n">Servlet</span> <span class="ow">or</span> <span class="n">Script</span> <span class="n">with</span> <span class="n">the</span> <span class="n">given</span> <span class="n">path</span> <span class="n">in</span> <span class="n">the</span> <span class="n">search</span> <span class="n">path</span>
-    <span class="sr">//</span> <span class="n">where</span> <span class="n">the</span> <span class="n">Script</span> <span class="n">is</span> <span class="n">allowed</span> <span class="n">to</span> <span class="n">have</span> <span class="n">Script</span> <span class="n">language</span> <span class="n">specific</span>
-    <span class="sr">//</span> <span class="n">extension</span><span class="p">,</span> <span class="n">such</span> <span class="n">as</span> <span class="o">.</span><span class="n">js</span><span class="p">,</span> <span class="o">.</span><span class="n">jsp</span><span class="p">,</span> <span class="n">etc</span><span class="o">.</span>
+    <span class="o">//</span> <span class="n">Find</span> <span class="n">a</span> <span class="n">Servlet</span> <span class="n">or</span> <span class="n">Script</span> <span class="n">with</span> <span class="n">the</span> <span class="n">given</span> <span class="n">path</span> <span class="n">in</span> <span class="n">the</span> <span class="n">search</span> <span class="n">path</span>
+    <span class="o">//</span> <span class="n">where</span> <span class="n">the</span> <span class="n">Script</span> <span class="n">is</span> <span class="n">allowed</span> <span class="n">to</span> <span class="n">have</span> <span class="n">Script</span> <span class="n">language</span> <span class="n">specific</span>
+    <span class="o">//</span> <span class="n">extension</span><span class="p">,</span> <span class="n">such</span> <span class="n">as</span> <span class="p">.</span><span class="n">js</span><span class="p">,</span> <span class="p">.</span><span class="n">jsp</span><span class="p">,</span> <span class="n">etc</span><span class="p">.</span>
 <span class="p">}</span>
 </pre></div>
 
@@ -263,7 +265,7 @@ Please see the new [Servlets](/documenta
 <p>Integration tests in the <a href="">launchpad/testing module</a> verify that these examples are correct.</p>
 <p>Contributions to these tests and examples are welcome, of course!</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/old-stuff/sling-api.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/sling-api.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/sling-api.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/sling-api.html" target="sling_cwiki">/site/sling-api.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Sling API</h1>
       <div class="note">
@@ -372,7 +374,7 @@ The [SlingRequestPathInfoTest]() demonst
 </table>
 <p>This specification does not define, how error handlers are configured and used if the Component Framework provides error handling support. Likewise the Component Framework may or may not implement support to handle calls to the <code>ComponentResponse.sendError</code> method. The Component Framework may also use its own error handling also for errors resulting from request processing failures, for example if authentication is required or if the request URL cannot be resolved to a Content object.</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/plugins.html
==============================================================================
--- websites/staging/sling/trunk/content/plugins.html (original)
+++ websites/staging/sling/trunk/content/plugins.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,11 +83,16 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/plugins.html" target="sling_cwiki">/site/plugins.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Plugins</h1>
       <p>These pages present the various Maven Plugins of Sling:</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +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/project-information.html
==============================================================================
--- websites/staging/sling/trunk/content/project-information.html (original)
+++ websites/staging/sling/trunk/content/project-information.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/project-information.html" target="sling_cwiki">/site/project-information.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Project Information</h1>
       <p>This document provides an overview of the various documents and links that are part of this project's general information:</p>
@@ -146,30 +148,30 @@
 <p>This project uses Subversion to manage its source code. Instructions on Subversion use can be found at <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a>.</p>
 <h3 id="web-access">Web Access</h3>
 <p>The following is a link to the online source repository.</p>
-<div class="codehilite"><pre><span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/viewvc/s</span><span class="n">ling</span><span class="o">/</span><span class="n">trunk</span>
+<div class="codehilite"><pre><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">viewvc</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">trunk</span>
 </pre></div>
 
 
 <h3 id="anonymous-access">Anonymous access</h3>
 <p>The source can be checked out anonymously from SVN with this command:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/sling/</span><span class="n">trunk</span> <span class="n">sling</span>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">checkout</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">trunk</span> <span class="n">sling</span>
 </pre></div>
 
 
 <h3 id="developer-access">Developer access</h3>
 <p>Everyone can access the Subversion repository via HTTPS, but Committers must checkout the Subversion repository via HTTPS.</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/sling/</span><span class="n">trunk</span> <span class="n">sling</span>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">checkout</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">trunk</span> <span class="n">sling</span>
 </pre></div>
 
 
 <p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="o">--</span><span class="n">username</span> <span class="n">your</span><span class="o">-</span><span class="n">username</span> <span class="o">-</span><span class="n">m</span> <span class="s">&quot;A message&quot;</span>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">commit</span> <span class="o">--</span><span class="n">username</span> <span class="n">your</span><span class="o">-</span><span class="n">username</span> <span class="o">-</span><span class="n">m</span> &quot;<span class="n">A</span> <span class="n">message</span>&quot;
 </pre></div>
 
 
 <h3 id="access-from-behind-a-firewall">Access from behind a firewall</h3>
 <p>For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via the developer connection:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/sling/</span><span class="n">trunk</span> <span class="n">sling</span>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">checkout</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">trunk</span> <span class="n">sling</span>
 </pre></div>
 
 
@@ -187,7 +189,7 @@
 <p>Sling builds run automatically on the ASF's <a href="https://builds.apache.org/view/S-Z/view/Sling/">Jenkins build server</a>, triggered by SVN changes and daily.</p>
 <p>See <a href="https://issues.apache.org/jira/browse/SLING-920">SLING-920</a> for Hudson configuration information.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1485858 by rombert on Thu, 23 May 2013 21:27:41 +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/project-information/security.html
==============================================================================
--- websites/staging/sling/trunk/content/project-information/security.html (original)
+++ websites/staging/sling/trunk/content/project-information/security.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/security.html" target="sling_cwiki">/site/security.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Security</h1>
       <h1 id="reporting-new-security-problems-with-apache-sling">Reporting New Security Problems with Apache Sling</h1>
@@ -107,7 +109,7 @@
 <h1 id="errors-and-omissions">Errors and omissions</h1>
 <p>Please report any errors or omissions to security(at)sling.apache.org.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475862 by dklco on Thu, 25 Apr 2013 17:28:38 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project



Mime
View raw message