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 [5/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/the-sling-engine/request-parameters.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/request-parameters.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/request-parameters.html 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/request-parameters.html" target="sling_cwiki">/site/request-parameters.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>Request Parameter Handling in Sling</h1>
       <h2 id="servlet-api">Servlet API</h2>
@@ -191,10 +186,10 @@
 <li>If the parameter is an uploaded file, the file name is re-encoded on the fly when accessed</li>
 </ul>
 <div class="info">
-Up to and including Sling Engine 2.2.2 request parameters are always decoded with ISO-8859-1 encoding if the `\*charset\*` request parameter is missing. As of Sling Engine 2.2.4 the `\*charset\*` request parameter is optional. As of this version the Sling Main Servlet supports a configuration setting which allows to change the default character encoding used if the `\*charset\*` request parameter is missing. To enable this functionality set the `sling.default.parameter.encoding` parameter of the Sling Main Servlet (PID `org.apache.sling.engine.impl.SlingMainServlet`) configuration to the desired encoding, which of course must be supported by the actual Java Platform.
+Up to and including Sling Engine 2.2.2 request parameters are always decoded with ISO-8859-1 encoding if the <code>_charset_</code> request parameter is missing. As of Sling Engine 2.2.4 the <code>_charset_</code> request parameter is optional. As of this version the Sling Main Servlet supports a configuration setting which allows to change the default character encoding used if the <code>_charset_</code> request parameter is missing. To enable this functionality set the <code>sling.default.parameter.encoding</code> parameter of the Sling Main Servlet (PID <code>org.apache.sling.engine.impl.SlingMainServlet</code>) configuration to the desired encoding, which of course must be supported by the actual Java Platform.
 </div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 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/resources.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/resources.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/servlets.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html 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/servlets.html" target="sling_cwiki">/site/servlets.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>Servlets and Scripts</h1>
       <div class="toc">
@@ -265,7 +260,7 @@ The mechanism helping the provider here 
 <h2 id="error-handler-servlets-or-scripts">Error Handler Servlet(s) or Scripts</h2>
 <p>Error handling support is now described on the <a href="/documentation/the-sling-engine/errorhandling.html">Errorhandling</a> page.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 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/sling-properties.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/sling-properties.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/sling-properties.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/the-sling-launchpad.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/the-sling-launchpad.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/the-sling-launchpad.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/url-decomposition.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/url-decomposition.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/url-decomposition.html Sun Jul  7 18:50:10 2013
@@ -83,19 +83,14 @@
       </div>
 
       
-      <div class="tip">
-           This page is a translated version of <a href="/site/url-decomposition.html" target="sling_cwiki">/site/url-decomposition.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>URL decomposition</h1>
       <p>During the <em>Resource Resolution</em> step, the client request URL is decomposed into the following parts:</p>
 <ol>
-<li><em>Resource Path</em> -  The longest substring of the request URL such that the resource path is either the complete request URL or the next character in the request URL after the resource path is a dot (<code>.</code>).</li>
-<li><em>Selectors</em> -  If the first character in the request URL after the resource path is a dot, the string after the dot up to but not including the last dot before the next slash character or the end of the request URL. If the resource path spans the complete request URL no seletors exist. If only one dot follows the resource path before the end of the request URL or the next slash, also no selectors exist.</li>
-<li><em>Extension</em> -  The string after the last dot after the resource path in the request URL but before the end of the request URL or the next slash after the resource path in the request URL. </li>
-<li><em>Suffix Path</em> -  If the request URL contains a slash character after the resource path and optional selectors and extension, the path starting with the slash up to the end of the request URL is the suffix path. Otherwise, the suffix path is empty. Note, that after the resource path at least a dot must be in the URL to let Sling detect the resource path.</li>
+<li><strong>Resource Path</strong> -  The longest substring of the request URL such that the resource path is either the complete request URL or the next character in the request URL after the resource path is a dot (<code>.</code>).</li>
+<li><strong>Selectors</strong> -  If the first character in the request URL after the resource path is a dot, the string after the dot up to but not including the last dot before the next slash character or the end of the request URL. If the resource path spans the complete request URL no seletors exist. If only one dot follows the resource path before the end of the request URL or the next slash, also no selectors exist.</li>
+<li><strong>Extension</strong> -  The string after the last dot after the resource path in the request URL but before the end of the request URL or the next slash after the resource path in the request URL. </li>
+<li><strong>Suffix Path</strong> -  If the request URL contains a slash character after the resource path and optional selectors and extension, the path starting with the slash up to the end of the request URL is the suffix path. Otherwise, the suffix path is empty. Note, that after the resource path at least a dot must be in the URL to let Sling detect the resource path.</li>
 </ol>
 <p>There's a cheat sheet on Day's dev page under <a href="http://dev.day.com/content/docs/en/cq/current/developing/sling_cheatsheet.html">http://dev.day.com/content/docs/en/cq/current/developing/sling_cheatsheet.html</a> available to get you familiar with the URL decomposition of Sling.</p>
 <p><em>Examples</em>: Assume there is a Resource at <code>/a/b</code>, which has no children.</p>
@@ -218,10 +213,11 @@
 </tbody>
 </table>
 <div class="info">
-The [SlingRequestPathInfoTest](http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/SlingRequestPathInfoTest.java) demonstrates and tests this decomposition. Feel free to suggest additional tests that help clarify how this works!
+<b>Automated tests and examples</b><br/>
+The <a href="http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/SlingRequestPathInfoTest.java">SlingRequestPathInfoTest</a> demonstrates and tests this decomposition. Feel free to suggest additional tests that help clarify how this works!
 </div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 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/url-to-script-resolution.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/url-to-script-resolution.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/url-to-script-resolution.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"
@@ -124,19 +121,19 @@ covered there, please let us know via th
 
 
 <p>The pseudo code for iterating the locations would be something like: </p>
-<div class="codehilite"><pre><span class="n">var</span> <span class="n">type</span> <span class="o">=</span> <span class="n">resource</span><span class="o">.</span><span class="n">getResourceType</span><span class="p">();</span> 
-<span class="k">while</span> <span class="p">(</span><span class="n">type</span> <span class="o">!=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span> 
-    <span class="k">for</span> <span class="p">(</span><span class="n">String</span> <span class="n">root:</span> <span class="n">resourceResolver</span><span class="o">.</span><span class="n">getSearchPath</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">root</span> <span class="o">+</span> <span class="n">type</span><span class="o">.</span><span class="n">toPath</span><span class="p">();</span> 
+<div class="codehilite"><pre><span class="n">var</span> <span class="n">type</span> <span class="p">=</span> <span class="n">resource</span><span class="p">.</span><span class="n">getResourceType</span><span class="p">();</span> 
+<span class="k">while</span> <span class="p">(</span><span class="n">type</span> !<span class="p">=</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span> 
+    <span class="k">for</span> <span class="p">(</span><span class="n">String</span> <span class="n">root</span><span class="p">:</span> <span class="n">resourceResolver</span><span class="p">.</span><span class="n">getSearchPath</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">root</span> <span class="o">+</span> <span class="n">type</span><span class="p">.</span><span class="n">toPath</span><span class="p">();</span> 
         <span class="n">findScriptsIn</span><span class="p">(</span><span class="n">path</span><span class="p">);</span> 
     <span class="p">}</span>
 
     <span class="k">if</span> <span class="p">(</span><span class="n">type</span> <span class="o">==</span> <span class="n">defaultServlet</span><span class="p">)</span> <span class="p">{</span> 
-        <span class="n">type</span> <span class="o">=</span> <span class="n">null</span><span class="p">;</span> 
+        <span class="n">type</span> <span class="p">=</span> <span class="n">null</span><span class="p">;</span> 
     <span class="p">}</span> <span class="k">else</span> <span class="p">{</span> 
-        <span class="n">type</span> <span class="o">=</span> <span class="n">getResourceSuperType</span><span class="p">(</span><span class="n">type</span><span class="p">);</span> 
+        <span class="n">type</span> <span class="p">=</span> <span class="n">getResourceSuperType</span><span class="p">(</span><span class="n">type</span><span class="p">);</span> 
         <span class="k">if</span> <span class="p">(</span><span class="n">type</span> <span class="o">==</span> <span class="n">null</span><span class="p">)</span> <span class="p">{</span> 
-            <span class="n">type</span> <span class="o">=</span> <span class="n">defaultServlet</span><span class="p">;</span> 
+            <span class="n">type</span> <span class="p">=</span> <span class="n">defaultServlet</span><span class="p">;</span> 
         <span class="p">}</span> 
     <span class="p">}</span> 
 <span class="p">}</span>

Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.html 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/wrap-or-decorate-resources.html" target="sling_cwiki">/site/wrap-or-decorate-resources.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>Wrap or Decorate Resources</h1>
       <h2 id="introduction">Introduction</h2>
@@ -96,27 +91,27 @@
 </em> add metadata</p>
 <h2></h2>
 <p>To add a resource decorator just register one or more services which implement the interface <code>ResourceDecorator</code></p>
-<div class="codehilite"><pre><span class="n">interface</span> <span class="n">ResourceDecorator</span> <span class="p">{</span>
-    <span class="n">Resource</span> <span class="n">decorate</span><span class="p">(</span><span class="n">Resource</span><span class="p">)</span>
+<div class="codehilite"><pre><span class="kd">interface</span> <span class="nc">ResourceDecorator</span> <span class="o">{</span>
+    <span class="n">Resource</span> <span class="nf">decorate</span><span class="o">(</span><span class="n">Resource</span><span class="o">)</span>
 
-    <span class="p">@</span><span class="n">Deprecated</span>
-    <span class="n">Resource</span> <span class="n">decorate</span><span class="p">(</span><span class="n">Resource</span><span class="p">,</span> <span class="n">HttpServletRequest</span><span class="p">)</span>
-<span class="p">}</span>
+    <span class="nd">@Deprecated</span>
+    <span class="n">Resource</span> <span class="nf">decorate</span><span class="o">(</span><span class="n">Resource</span><span class="o">,</span> <span class="n">HttpServletRequest</span><span class="o">)</span>
+<span class="o">}</span>
 </pre></div>
 
 
 <p>The registered decorators will be called from the resource resolver for each resource returned. 
 If the service decorates the resource it should return the new resource. If the service does not want to decorate the resource, it should return the original resource or null. </p>
-<p>The two-argument <code>{decorate</code>} method will not be invoked, starting with version 2.1.0 of the JCR Resource bundle. Implementors of this interface targeting both newer and older versions of this bundle are advised to implement this method with:</p>
-<div class="codehilite"><pre>    <span class="n">public</span> <span class="n">Resource</span> <span class="n">decorate</span><span class="p">(</span><span class="n">Resource</span> <span class="n">resource</span><span class="p">,</span> <span class="n">HttpServletRequest</span> <span class="n">request</span><span class="p">)</span> <span class="p">{</span>
-        <span class="k">return</span> <span class="n">this</span><span class="p">.</span><span class="n">decorate</span><span class="p">(</span><span class="n">resource</span><span class="p">);</span>
-    <span class="p">}</span>
+<p>The two-argument <code>decorate</code> method will not be invoked, starting with version 2.1.0 of the JCR Resource bundle. Implementors of this interface targeting both newer and older versions of this bundle are advised to implement this method with:</p>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="n">Resource</span> <span class="nf">decorate</span><span class="o">(</span><span class="n">Resource</span> <span class="n">resource</span><span class="o">,</span> <span class="n">HttpServletRequest</span> <span class="n">request</span><span class="o">)</span> <span class="o">{</span>
+    <span class="k">return</span> <span class="k">this</span><span class="o">.</span><span class="na">decorate</span><span class="o">(</span><span class="n">resource</span><span class="o">);</span>
+<span class="o">}</span>
 </pre></div>
 
 
-<p>And use some other method (e.g. a <code>{ThreadLocal</code>}) to obtain the current request if necessary.</p>
+<p>And use some other method (e.g. a <code>ThreadLocal</code>) to obtain the current request if necessary.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 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/tutorials-how-tos.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos.html 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/tutorials-how-tos.html" target="sling_cwiki">/site/tutorials-how-tos.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>Tutorials &amp; How-Tos</h1>
       <ul>
@@ -99,7 +94,7 @@
 <li><a href="/documentation/tutorials-how-tos/testing-sling-based-applications.html">Testing Sling-based applications</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 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/tutorials-how-tos/46-line-blog.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/46-line-blog.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/46-line-blog.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"
@@ -127,7 +124,7 @@
 
 
 <p>That's two input fields, a submit button and a hidden field that tells Sling what to do after the POST (in this case: redirect to the html view of the node that was just created).</p>
-<p>To test the form, start Sling and save the above script as  <sup id="fnref:esp"><a href="#fn:esp" rel="footnote">1</a></sup>  in the Sling repository - a WebDAV mount is the easiest way to do that. Browsing to <a href="http://localhost:8888/content/blog/*.html">http://localhost:8888/content/blog/*.html</a> <sup id="fnref:port"><a href="#fn:port" rel="footnote">2</a></sup> should display the above form.</p>
+<p>To test the form, start Sling and save the above script as  <sup id="fnref:esp"><a class="footnote-ref" href="#fn:esp" rel="footnote">1</a></sup>  in the Sling repository - a WebDAV mount is the easiest way to do that. Browsing to <a href="http://localhost:8888/content/blog/*.html">http://localhost:8888/content/blog/*.html</a> <sup id="fnref:port"><a class="footnote-ref" href="#fn:port" rel="footnote">2</a></sup> should display the above form.</p>
 <p>Input some data (using "foo" for the title, for the sake of our examples below), save the form, and Sling should display the form again, using the URL of the node that was just created.</p>
 <div class="note">
 If you get an error saying _javax.jcr.AccessDeniedException: ...not allowed to add or modify item_ it means that you are not logged in as user _admin_. See instructions above for logging in.
@@ -137,9 +134,9 @@ If you get an error saying _javax.jcr.Ac
 <h2 id="step-2-wheres-my-content">Step 2: Where's my content?</h2>
 <p>To verify that our content has been created, we can have a look at the JSON data at <a href="http://localhost:8888/content/blog/foo.tidy.json">http://localhost:8888/content/blog/foo.tidy.json</a>, which should display our new node's values:</p>
 <div class="codehilite"><pre><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>
-  <span class="s">&quot;text&quot;</span><span class="p">:</span> <span class="s">&quot;This is the foo text&quot;</span><span class="p">,</span>
-  <span class="s">&quot;title&quot;</span><span class="p">:</span> <span class="s">&quot;foo&quot;</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>
+  &quot;<span class="n">text</span>&quot;<span class="p">:</span> &quot;<span class="n">This</span> <span class="n">is</span> <span class="n">the</span> <span class="n">foo</span> <span class="n">text</span>&quot;<span class="p">,</span>
+  &quot;<span class="n">title</span>&quot;<span class="p">:</span> &quot;<span class="n">foo</span>&quot;
 <span class="p">}</span>
 </pre></div>
 
@@ -187,8 +184,8 @@ If you get an error saying _javax.jcr.Ac
 <p>You might have heard this mantra, which we apply in many areas of Sling.</p>
 <p>In this case, adding a new field to our blog posts could not be easier: just add an input field to the form, and Sling will do the rest.</p>
 <p>Adding this inside our script's <code>&lt;form&gt;</code> element, for example:</p>
-<div class="codehilite"><pre><span class="sr">&lt;br/&gt;</span><span class="n">Author:</span><span class="sr">&lt;br/&gt;</span>
-<span class="o">&lt;</span><span class="n">input</span> <span class="n">type</span><span class="o">=</span><span class="s">&quot;author&quot;</span> <span class="n">name</span><span class="o">=</span><span class="s">&quot;author&quot;</span> <span class="n">style</span><span class="o">=</span><span class="s">&quot;width:100%&quot;</span><span class="o">/&gt;</span>
+<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">br</span><span class="o">/&gt;</span><span class="n">Author</span><span class="p">:</span><span class="o">&lt;</span><span class="n">br</span><span class="o">/&gt;</span>
+<span class="o">&lt;</span><span class="n">input</span> <span class="n">type</span><span class="p">=</span>&quot;<span class="n">author</span>&quot; <span class="n">name</span><span class="p">=</span>&quot;<span class="n">author</span>&quot; <span class="n">style</span><span class="p">=</span>&quot;<span class="n">width</span><span class="p">:</span>100<span class="c">%&quot;/&gt;</span>
 </pre></div>
 
 
@@ -203,10 +200,10 @@ If you get an error saying _javax.jcr.Ac
 <hr />
 <ol>
 <li id="fn:esp">
-<p>ESP is Sling's server-side javascript language&#160;<a href="#fnref:esp" rev="footnote" title="Jump back to footnote 1 in the text">&#8617;</a></p>
+<p>ESP is Sling's server-side javascript language&#160;<a class="footnote-backref" href="#fnref:esp" rev="footnote" title="Jump back to footnote 1 in the text">&#8617;</a></p>
 </li>
 <li id="fn:port">
-<p>This assumes your instance of Sling is running on port 8888. If that's not the case, adjust the example URLs accordingly.&#160;<a href="#fnref:port" rev="footnote" title="Jump back to footnote 2 in the text">&#8617;</a></p>
+<p>This assumes your instance of Sling is running on port 8888. If that's not the case, adjust the example URLs accordingly.&#160;<a class="footnote-backref" href="#fnref:port" rev="footnote" title="Jump back to footnote 2 in the text">&#8617;</a></p>
 </li>
 </ol>
 </div>

Modified: websites/staging/sling/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html 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/getting-resources-and-properties-in-sling.html" target="sling_cwiki">/site/getting-resources-and-properties-in-sling.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>Getting Resources and Properties in Sling</h1>
       <p>The Resource is one of the central parts of Sling. Extending from JCR's Everything is Content, Sling assumes Everthing is a Resource. Thus Sling is maintaining a virtual tree of resources, which is a merger of the actual contents in the JCR Repository and resources provided by so called resource providers. By doing this Sling fits very well in the paradigm of the REST architecture.</p>
@@ -114,12 +109,12 @@
 
 <span class="kd">public</span> <span class="kt">void</span> <span class="nf">myMethod</span><span class="o">()</span> <span class="o">{</span>
     <span class="k">try</span> <span class="o">{</span>
-    <span class="n">String</span> <span class="n">resourcePath</span> <span class="o">=</span> <span class="s">&quot;path/to/resource&quot;</span><span class="o">;</span>
+        <span class="n">String</span> <span class="n">resourcePath</span> <span class="o">=</span> <span class="s">&quot;path/to/resource&quot;</span><span class="o">;</span>
         <span class="n">ResourceResolver</span> <span class="n">resourceResolver</span> <span class="o">=</span> <span class="n">resolverFactory</span><span class="o">.</span><span class="na">getAdministrativeResourceResolver</span><span class="o">(</span><span class="kc">null</span><span class="o">);</span>
-    <span class="n">Resource</span> <span class="n">res</span> <span class="o">=</span> <span class="n">resourceResolver</span><span class="o">.</span><span class="na">getResource</span><span class="o">(</span><span class="n">resourcePath</span><span class="o">);</span>
-    <span class="c1">// do something with the resource</span>
-    <span class="c1">// when done, close the ResourceResolver</span>
-    <span class="n">resourceResolver</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
+        <span class="n">Resource</span> <span class="n">res</span> <span class="o">=</span> <span class="n">resourceResolver</span><span class="o">.</span><span class="na">getResource</span><span class="o">(</span><span class="n">resourcePath</span><span class="o">);</span>
+        <span class="c1">// do something with the resource</span>
+        <span class="c1">// when done, close the ResourceResolver</span>
+        <span class="n">resourceResolver</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
     <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">LoginException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
         <span class="c1">// log the error</span>
     <span class="o">}</span>
@@ -130,8 +125,8 @@
 <h2 id="within-a-servlet">Within a Servlet</h2>
 <p>You can access the resource defined by the request URL through the <code>SlingHttpServletRequest</code>:</p>
 <table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre>1
-2</pre></div></td><td class="code"><div class="codehilite"><pre><span class="n">Resource</span> <span class="n">res</span> <span class="o">=</span> <span class="n">req</span><span class="o">.</span><span class="na">getResource</span><span class="o">();</span>
-<span class="c1">// req is the SlingHttpServletRequest</span>
+2</pre></div></td><td class="code"><div class="codehilite"><pre><span class="c1">// req is the SlingHttpServletRequest</span>
+<span class="n">Resource</span> <span class="n">res</span> <span class="o">=</span> <span class="n">req</span><span class="o">.</span><span class="na">getResource</span><span class="o">();</span>
 </pre></div>
 </td></tr></table>
 
@@ -140,8 +135,8 @@
 2
 3
 4</pre></div></td><td class="code"><div class="codehilite"><pre><span class="n">String</span> <span class="n">resourcePath</span> <span class="o">=</span> <span class="s">&quot;path/to/resource&quot;</span><span class="o">;</span>
-<span class="n">ResourceResolver</span> <span class="n">resourceResolver</span> <span class="o">=</span> <span class="n">req</span><span class="o">.</span><span class="na">getResourceResolver</span><span class="o">();</span>
 <span class="c1">// req is the SlingHttpServletRequest</span>
+<span class="n">ResourceResolver</span> <span class="n">resourceResolver</span> <span class="o">=</span> <span class="n">req</span><span class="o">.</span><span class="na">getResourceResolver</span><span class="o">();</span>
 <span class="n">Resource</span> <span class="n">res</span> <span class="o">=</span> <span class="n">resourceResolver</span><span class="o">.</span><span class="na">getResource</span><span class="o">(</span><span class="n">resourcePath</span><span class="o">);</span>
 </pre></div>
 </td></tr></table>
@@ -155,8 +150,8 @@
 4
 5</pre></div></td><td class="code"><div class="codehilite"><pre><span class="nt">&lt;sling:defineObjects&gt;</span>
 <span class="k">&lt;%</span>
-<span class="n">String</span> <span class="n">resourcePath</span> <span class="o">=</span> <span class="s">&quot;path/to/resource&quot;</span><span class="o">;</span>
-<span class="n">Resource</span> <span class="n">res</span> <span class="o">=</span> <span class="n">resourceResolver</span><span class="o">.</span><span class="na">getResource</span><span class="o">(</span><span class="n">resourcePath</span><span class="o">);</span>
+    <span class="n">String</span> <span class="n">resourcePath</span> <span class="o">=</span> <span class="s">&quot;path/to/resource&quot;</span><span class="o">;</span>
+    <span class="n">Resource</span> <span class="n">res</span> <span class="o">=</span> <span class="n">resourceResolver</span><span class="o">.</span><span class="na">getResource</span><span class="o">(</span><span class="n">resourcePath</span><span class="o">);</span>
 <span class="k">%&gt;</span>
 </pre></div>
 </td></tr></table>
@@ -170,15 +165,15 @@
 <h2 id="accessing-a-property">Accessing a Property</h2>
 <p>The <code>ValueMap</code> is an easy way to access properties of a resource. With most resources you can use <code>Adaptable.adaptTo(Class)</code> to adapt the resource to a value map:</p>
 <table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre>1
-2</pre></div></td><td class="code"><div class="codehilite"><pre><span class="n">ValueMap</span> <span class="n">properties</span> <span class="o">=</span> <span class="n">res</span><span class="o">.</span><span class="na">adaptTo</span><span class="o">(</span><span class="n">ValueMap</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
-<span class="c1">// res is the Resource</span>
+2</pre></div></td><td class="code"><div class="codehilite"><pre><span class="c1">// res is the Resource</span>
+<span class="n">ValueMap</span> <span class="n">properties</span> <span class="o">=</span> <span class="n">res</span><span class="o">.</span><span class="na">adaptTo</span><span class="o">(</span><span class="n">ValueMap</span><span class="o">.</span><span class="na">class</span><span class="o">);</span>
 </pre></div>
 </td></tr></table>
 
 <p>You can also access the properties through the <code>ResourceUtil</code> utility class:</p>
 <table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre>1
-2</pre></div></td><td class="code"><div class="codehilite"><pre><span class="n">ValueMap</span> <span class="n">properties</span> <span class="o">=</span> <span class="n">ResourceUtil</span><span class="o">.</span><span class="na">getValueMap</span><span class="o">(</span><span class="n">res</span><span class="o">);</span>
-<span class="c1">// res is the Resource</span>
+2</pre></div></td><td class="code"><div class="codehilite"><pre><span class="c1">// res is the Resource</span>
+<span class="n">ValueMap</span> <span class="n">properties</span> <span class="o">=</span> <span class="n">ResourceUtil</span><span class="o">.</span><span class="na">getValueMap</span><span class="o">(</span><span class="n">res</span><span class="o">);</span>
 </pre></div>
 </td></tr></table>
 
@@ -189,7 +184,7 @@
 
 <p>For more details about resources and how to access them in Sling, you can refer to the <a href="/documentation/the-sling-engine/resources.html">Sling documentation about Resources</a>.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 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/tutorials-how-tos/how-to-manage-events-in-sling.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/how-to-manage-events-in-sling.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/how-to-manage-events-in-sling.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"
@@ -121,8 +118,9 @@ Sling makes a distinction between events
 an event.topics property that describes which event topics the handler is interested in.</p>
 <p>To listen to a Sling <strong>resource added</strong> events, for example, you'll set the <em>event.topics</em> property to 
 <strong>org.apache.sling.api.SlingConstants.TOPIC_RESOURCE_ADDED</strong> in the class annotations:</p>
-<div class="codehilite"><pre> <span class="nd">@Property</span><span class="o">(</span><span class="n">name</span><span class="o">=</span><span class="s">&quot;event.topics&quot;</span><span class="o">,</span>
-    <span class="n">value</span><span class="o">=</span><span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">sling</span><span class="o">.</span><span class="na">api</span><span class="o">.</span><span class="na">SlingConstants</span><span class="o">.</span><span class="na">TOPIC_RESOURCE_ADDED</span><span class="o">)</span>
+<div class="codehilite"><pre> <span class="p">:::</span><span class="n">java</span>
+ <span class="p">@</span><span class="n">Property</span><span class="p">(</span><span class="n">name</span><span class="p">=</span>&quot;<span class="n">event</span><span class="p">.</span><span class="n">topics</span>&quot;<span class="p">,</span>
+    <span class="n">value</span><span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">api</span><span class="p">.</span><span class="n">SlingConstants</span><span class="p">.</span><span class="n">TOPIC_RESOURCE_ADDED</span><span class="p">)</span>
 </pre></div>
 
 

Modified: websites/staging/sling/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.html Sun Jul  7 18:50:10 2013
@@ -83,15 +83,10 @@
       </div>
 
       
-      <div class="tip">
-           This page is a translated version of <a href="/site/installing-and-upgrading-bundles.html" target="sling_cwiki">/site/installing-and-upgrading-bundles.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>Installing and Upgrading Bundles</h1>
       <div class="note">
-We recommend to use the Apache Felix Web Console. The documentation below describes the old Sling Management Console, which isn't in use any more. Please refer to the documentation of the [Apache Felix Web Console](http://felix.apache.org/site/apache-felix-web-console.html).
+We recommend to use the Apache Felix Web Console. The documentation below describes the old Sling Management Console, which isn't in use any more. Please refer to the documentation of the <a href="http://felix.apache.org/site/apache-felix-web-console.html">Apache Felix Web Console</a>.
 </div>
 
 <p>OSGi bundles installed in the OSGi framework, which is provided by Sling, may be upgraded or removed and new bundles may be installed by using the Sling Management Console. This page is about using the Sling Management Console for those tasks.</p>
@@ -122,29 +117,14 @@ We recommend to use the Apache Felix Web
 <h3 id="managing-osgi-bundle-repositories">Managing OSGi Bundle Repositories</h3>
 <p>Currently management of known OSGi Bundle Repositories is very simple. If a configured bundle repository is not available on startup, it will be marked as being inactive. If you know the repository is now available, you may click on the <em>Refresh</em> button, to activate it. Similarly, the contents of the repository may be modified by for example adding new bundles or updating bundles in the repository, these changes will be made known to Sling by clicking the <em>Refresh</em> button.</p>
 <p>There exists no GUI functionality yet to add a new repository to the list of known repositories. Instead you may submit a request with parameters <code>action</code> whose value must be <code>refreshOBR</code> and <code>repository</code> whose value must be the URL to the repository descriptor file generally called <code>repository.xml</code>.</p>
-<p>For example, if you run Sling on <code>http``://localhost:7402/sample</code> with default location of the Sling Management Console, the following request would add a repository at <code>/tmp/repo/repository.xml</code> in the filesystem:</p>
+<p>For example, if you run Sling on <code>http://localhost:7402/sample</code> with default location of the Sling Management Console, the following request would add a repository at <code>/tmp/repo/repository.xml</code> in the filesystem:</p>
 <div class="codehilite"><pre>http://localhost:7402/sample/system/console/bundlerepo?action=refreshOBR<span class="err">&amp;</span>repository=file:///tmp/repo/repository.xml
 </pre></div>
 
 
-<p>Some Java Sample:</p>
-<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre>1
-2
-3
-4
-5
-6</pre></div></td><td class="code"><div class="codehilite"><pre><span class="kd">public</span> <span class="kd">class</span> <span class="nc">Test</span> <span class="o">{</span>
-    <span class="kd">public</span> <span class="kd">static</span> <span class="n">String</span> <span class="n">x</span> <span class="o">=</span> <span class="s">&quot;&quot;</span><span class="o">;</span>
-    <span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="o">{</span>
-        <span class="kt">int</span> <span class="n">x</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span>
-    <span class="o">}</span>
-<span class="o">}</span>
-</pre></div>
-</td></tr></table>
-
 <p>Note: Only use <code>file:</code> URLs if you know Sling has access to the named file !</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 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/tutorials-how-tos/jackrabbit-persistence.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.html 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/jackrabbit-persistence.html" target="sling_cwiki">/site/jackrabbit-persistence.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>Jackrabbit Persistence</h1>
       <p>Out-of-the-box the embedded Jackrabbit repository used by Sling (the Embedded Jackrabbit Repository bundle) uses Derby to persist the JCR nodes and properties. For some applications or environments it may be required or required to replace Derby with another backing store such as PostgreSQL or Oracle.</p>
@@ -102,7 +97,7 @@
 <p>When you are not using the Derby persistence manager, you may safely remove the Derby bundle from your Sling instance.</p>
 <h2 id="jdbc-driver">JDBC Driver</h2>
 <p>The hardest thing to do is probably getting the JDBC driver for your database. One option is to look at the bundles provided by Spring Source in their repository at <a href="http://www.springsource.com/repository/">http://www.springsource.com/repository/</a>.</p>
-<p>Another option is to create the bundle on your own using Peter Kriens' <a href="http://www.aqute.biz/Code/Bnd">BND Tool</a>:</p>
+<p>Another option is to create the bundle on your own using Peter Kriens' <a href="http://www.aqute.biz/Bnd/Bnd">BND Tool</a>:</p>
 <ol>
 <li>Get the JDBC driver for your database from the driver provider</li>
 <li>
@@ -179,7 +174,7 @@ This needs to be reconfigured and restar
 <h2 id="credits">Credits</h2>
 <p>This description is based on Tony Giaccone's description <a href="http://markmail.org/message/wlbfrukmjjsl33hh">Swapping Postgres for Derby</a> sent to the Sling Users mailing list.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 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/tutorials-how-tos/testing-sling-based-applications.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/testing-sling-based-applications.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/testing-sling-based-applications.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/downloads.html
==============================================================================
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.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/errors/403.html
==============================================================================
--- websites/staging/sling/trunk/content/errors/403.html (original)
+++ websites/staging/sling/trunk/content/errors/403.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/errors/404.html
==============================================================================
--- websites/staging/sling/trunk/content/errors/404.html (original)
+++ websites/staging/sling/trunk/content/errors/404.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"

Added: websites/staging/sling/trunk/content/extpaths.txt
==============================================================================
--- websites/staging/sling/trunk/content/extpaths.txt (added)
+++ websites/staging/sling/trunk/content/extpaths.txt Sun Jul  7 18:50:10 2013
@@ -0,0 +1,5 @@
+# File format: lines starting with # or space chars are ignored.
+# source https://svn.apache.org/repos/asf/infrastructure/site/trunk/content/extpaths.txt
+mail
+dist
+.revision

Modified: websites/staging/sling/trunk/content/index.html
==============================================================================
--- websites/staging/sling/trunk/content/index.html (original)
+++ websites/staging/sling/trunk/content/index.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/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
@@ -200,7 +195,7 @@ such as <a href="http://www.eclipse.org/
         });
 </script>
       <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/news.html
==============================================================================
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.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/old-stuff/run-modes-org-apache-sling-runmode.html
==============================================================================
--- websites/staging/sling/trunk/content/old-stuff/run-modes-org-apache-sling-runmode.html (original)
+++ websites/staging/sling/trunk/content/old-stuff/run-modes-org-apache-sling-runmode.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/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 Sun Jul  7 18:50:10 2013
@@ -83,16 +83,261 @@
       </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>
-      
+      <p>In the <em>Apache Sling Scripting W3C XML Processing Support</em> bundle, Juanjo Vàzquez has implemented XSLT processing support for Sling as another new scripting engine, based on the <a href="http://cocoon.apache.org/3.0/">Cocoon 3 pipeline engine</a>.</p>
+<h2 id="intro">Intro</h2>
+<p>An XML pipeline specifies a sequence of operations to be performed on zero or more XML documents. There are a number of advantages to using pipelines above all in terms of separation of concerns. On the other hand, we talk about XSLT processing if the operations in a pipeline are performed executing or applying XSLT stylesheets.</p>
+<p>XSLT processing support is implemented in Sling as an scripting engine bundle named <em>Apache Sling Scripting W3C XML Processing Support</em>. This bundle is based on the <a href="http://cocoon.apache.org/3.0/">Cocoon 3 pipeline engine</a> and uses the <a href="http://www.w3.org/TR/xproc/">W3C XProc language</a> in order to specify pipelines to be processed.</p>
+<p>For the time being, XProc is partially implemented and it is not clear that Sling must support all W3C recomendation yet. This could depend of concrete user requirements or use cases.</p>
+<p>The source code is found in the <a href="http://svn.apache.org/repos/asf/incubator/sling/trunk/contrib/scripting/xproc">contrib/scripting/xproc</a> module.</p>
+<h2 id="how-to-install">How to Install</h2>
+<p>Install the <code>org.apache.sling.scripting.xproc</code> bundle in order to work with XProc. You can achieve this either building it from <code>contrib/scripting/xproc</code> folder in the Sling trunk or by downloading it from the Apache Snapshot repository here: <a href="http://people.apache.org/repo/m2-snapshot-repository/org/apache/sling/org.apache.sling.scripting.xproc/2.0.0-incubator-SNAPSHOT/org.apache.sling.scripting.xproc-2.0.0-incubator-20090403.114403-1.jar">org.apache.sling.scripting.xproc-2.0.0-incubator-20090403.114403-1.jar</a>.</p>
+<p>To deploy the bundle go to the bundles page of Apache Felix Web Console (http://localhost:8888/system/console/bundles), select the bundle file to upload, check the Start check box and click Install or Update button.</p>
+<p>In order to check whether XProc scripting engine has been installed, go to the Script Engines page of the Apache Felix Web Console and see the entry for XProc there:</p>
+<div class="codehilite"><pre><span class="n">Apache</span> <span class="n">Sling</span> <span class="n">Scripting</span> <span class="n">W3C</span> <span class="n">XML</span> <span class="n">Processing</span> <span class="n">Support</span><span class="p">,</span> 2<span class="p">.</span>0<span class="p">.</span>0<span class="o">-</span><span class="n">incubator</span><span class="o">-</span><span class="n">SNAPSHOT</span>
+    <span class="n">Language</span>    <span class="n">XMLProc</span><span class="p">,</span> 1<span class="p">.</span>0
+    <span class="n">Extensions</span>  <span class="n">xpl</span>
+    <span class="n">MIME</span> <span class="n">Types</span>  <span class="n">application</span><span class="o">/</span><span class="n">xml</span>
+    <span class="n">Names</span>   <span class="n">XProc</span><span class="p">,</span> <span class="n">xml</span> <span class="n">processing</span><span class="p">,</span> <span class="n">xml</span> <span class="n">pipeline</span> <span class="n">processor</span>
+</pre></div>
+
+
+<h2 id="how-it-works">How it works</h2>
+<p>As explained above, the bundle is able to perform a sequence of XSLT transforms on an XML document just as is expressed in a pipeline definition. A pipeline definition is a file with an xpl extension that follows the <a href="http://www.w3.org/TR/xproc/">W3C XProc grammar</a>. Only <code>p:xslt</code> steps are supported at the moment.</p>
+<p>For the XML input of pipeline, the processing uses a Cocoon generator named <code>SlingGenerator</code> that tries to resolve the requested resource as (in order of preference):</p>
+<ul>
+<li>a static XML file </li>
+<li>a dynamically generated XML </li>
+<li>the underlying node's export document view </li>
+</ul>
+<h2 id="samples">Samples</h2>
+<p>Let's see some samples in order to understand the processing behaviour.</p>
+<ol>
+<li>
+<p>Create some content</p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre>1
+2</pre></div></td><td class="code"><div class="codehilite"><pre><span class="nv">$ </span>curl -u admin:admin -F sling:resourceType<span class="o">=</span>xproc -F <span class="nv">title</span><span class="o">=</span><span class="s2">&quot;some title&quot;</span> <span class="se">\</span>
+-F <span class="nv">text</span><span class="o">=</span><span class="s2">&quot;And some text&quot;</span> http://localhost:8888/foo
+</pre></div>
+</td></tr></table>
+
+</li>
+<li>
+<p>Use WebDAV or curl to create a pipeline script at <code>/apps/xproc/xproc.xpl</code> :</p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
+13
+14
+15
+16</pre></div></td><td class="code"><div class="codehilite"><pre><span class="cp">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</span>
+<span class="nt">&lt;p:pipeline</span> <span class="na">xmlns:p=</span><span class="s">&quot;http://www.w3.org/ns/xproc&quot;</span><span class="nt">&gt;</span>
+
+  <span class="nt">&lt;p:xslt&gt;</span>
+    <span class="nt">&lt;p:input</span> <span class="na">port=</span><span class="s">&quot;stylesheet&quot;</span><span class="nt">&gt;</span>
+      <span class="nt">&lt;p:document</span> <span class="na">href=</span><span class="s">&quot;/apps/xproc/one.xsl&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;/p:input&gt;</span>
+  <span class="nt">&lt;/p:xslt&gt;</span>
+
+  <span class="nt">&lt;p:xslt&gt;</span>
+    <span class="nt">&lt;p:input</span> <span class="na">port=</span><span class="s">&quot;stylesheet&quot;</span><span class="nt">&gt;</span>
+      <span class="nt">&lt;p:document</span> <span class="na">href=</span><span class="s">&quot;/apps/xproc/two.xsl&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;/p:input&gt;</span>
+  <span class="nt">&lt;/p:xslt&gt;</span>
+
+<span class="nt">&lt;/p:pipeline&gt;</span>
+</pre></div>
+</td></tr></table>
+
+</li>
+<li>
+<p>Store the XSLT transforms in the repository:</p>
+<p><strong><code>/apps/xproc/one.xsl</code></strong></p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10</pre></div></td><td class="code"><div class="codehilite"><pre><span class="nt">&lt;xsl:stylesheet</span> <span class="na">version=</span><span class="s">&quot;1.0&quot;</span>
+    <span class="na">xmlns:xsl=</span><span class="s">&quot;http://www.w3.org/1999/XSL/Transform&quot;</span><span class="nt">&gt;</span>
+
+    <span class="nt">&lt;xsl:template</span> <span class="na">match=</span><span class="s">&quot;/&quot;</span><span class="nt">&gt;</span>
+      <span class="nt">&lt;one&gt;</span>
+        <span class="nt">&lt;xsl:copy-of</span> <span class="na">select=</span><span class="s">&quot;.&quot;</span><span class="nt">/&gt;</span>
+      <span class="nt">&lt;/one&gt;</span>
+    <span class="nt">&lt;/xsl:template&gt;</span>
+
+<span class="nt">&lt;/xsl:stylesheet&gt;</span>
+</pre></div>
+</td></tr></table>
+
+<p><strong><code>/apps/xproc/two.xsl</code></strong></p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10</pre></div></td><td class="code"><div class="codehilite"><pre><span class="nt">&lt;xsl:stylesheet</span> <span class="na">version=</span><span class="s">&quot;1.0&quot;</span>
+    <span class="na">xmlns:xsl=</span><span class="s">&quot;http://www.w3.org/1999/XSL/Transform&quot;</span><span class="nt">&gt;</span>
+
+    <span class="nt">&lt;xsl:template</span> <span class="na">match=</span><span class="s">&quot;/&quot;</span><span class="nt">&gt;</span>
+      <span class="nt">&lt;two&gt;</span>
+        <span class="nt">&lt;xsl:copy-of</span> <span class="na">select=</span><span class="s">&quot;.&quot;</span><span class="nt">/&gt;</span>
+      <span class="nt">&lt;/two&gt;</span>
+    <span class="nt">&lt;/xsl:template&gt;</span>
+
+<span class="nt">&lt;/xsl:stylesheet&gt;</span>
+</pre></div>
+</td></tr></table>
+
+</li>
+<li>
+<p>Request foo.html to execute the pipeline:</p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre>1
+2
+3
+4
+5
+6
+7
+8</pre></div></td><td class="code"><div class="codehilite"><pre><span class="nv">$ </span>curl http://admin:admin@localhost:8888/foo.html
+
+&lt;?xml <span class="nv">version</span><span class="o">=</span><span class="s2">&quot;1.0&quot;</span> <span class="nv">encoding</span><span class="o">=</span><span class="s2">&quot;UTF-8&quot;</span>?&gt;
+&lt;two&gt;
+  &lt;one&gt;
+    &lt;foo ...sling:resourceType<span class="o">=</span><span class="s2">&quot;xproc&quot;</span> <span class="nv">text</span><span class="o">=</span><span class="s2">&quot;And some text&quot;</span> <span class="nv">title</span><span class="o">=</span><span class="s2">&quot;some title&quot;</span>/&gt;
+  &lt;/one&gt;
+&lt;/two&gt;
+</pre></div>
+</td></tr></table>
+
+<p>In this case, the node's document view has been the pipeline's source.</p>
+</li>
+<li>
+<p>Now, store a static XML in the repository at <code>/foo.xml</code>:</p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre>1
+2
+3
+4
+5
+6</pre></div></td><td class="code"><div class="codehilite"><pre><span class="cp">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</span>
+<span class="nt">&lt;foo&gt;</span>
+    <span class="nt">&lt;content&gt;</span>
+        foo: static content
+    <span class="nt">&lt;/content&gt;</span>
+<span class="nt">&lt;/foo&gt;</span>
+</pre></div>
+</td></tr></table>
+
+</li>
+<li>
+<p>Again, request foo.html to execute the pipeline:</p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12</pre></div></td><td class="code"><div class="codehilite"><pre><span class="nv">$ </span>curl http://admin:admin@localhost:8888/foo.html
+
+&lt;?xml <span class="nv">version</span><span class="o">=</span><span class="s2">&quot;1.0&quot;</span> <span class="nv">encoding</span><span class="o">=</span><span class="s2">&quot;UTF-8&quot;</span>?&gt;
+&lt;two&gt;
+  &lt;one&gt;
+    &lt;foo&gt;
+        &lt;content&gt;
+          foo: static content
+        &lt;/content&gt;
+    &lt;/foo&gt;
+  &lt;/one&gt;
+&lt;/two&gt;
+</pre></div>
+</td></tr></table>
+
+<p>This time the pipeline's source has been a static XML file.</p>
+</li>
+<li>
+<p>Store a script in the repository at <code>/apps/xproc/xproc.xml.esp</code></p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre>1
+2
+3
+4
+5
+6</pre></div></td><td class="code"><div class="codehilite"><pre><span class="cp">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</span>
+<span class="nt">&lt;foo&gt;</span>
+    <span class="nt">&lt;content&gt;</span>
+        foo: dynamic content
+    <span class="nt">&lt;/content&gt;</span>
+<span class="nt">&lt;/foo&gt;</span>
+</pre></div>
+</td></tr></table>
+
+</li>
+<li>
+<p>Delete the previously created static xml file <code>/foo.xml</code>.</p>
+</li>
+<li>
+<p>Request foo.html to execute the pipeline:</p>
+<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12</pre></div></td><td class="code"><div class="codehilite"><pre><span class="nv">$ </span>curl http://admin:admin@localhost:8888/foo.html
+
+&lt;?xml <span class="nv">version</span><span class="o">=</span><span class="s2">&quot;1.0&quot;</span> <span class="nv">encoding</span><span class="o">=</span><span class="s2">&quot;UTF-8&quot;</span>?&gt;
+&lt;two&gt;
+  &lt;one&gt;
+    &lt;foo&gt;
+        &lt;content&gt;
+          foo: dynamic content
+        &lt;/content&gt;
+    &lt;/foo&gt;
+  &lt;/one&gt;
+&lt;/two&gt;
+</pre></div>
+</td></tr></table>
+
+<p>This time the pipeline's source has been a dinamically generated XML.</p>
+</li>
+</ol>
+<h2 id="references">References</h2>
+<ul>
+<li><a href="http://cocoon.apache.org//3.0/">Cocoon 3 pipeline engine</a></li>
+<li><a href="http://www.w3.org/TR/xproc/">W3C XProc language</a></li>
+<li><a href="https://issues.apache.org/jira/browse/SLING-893">SLING-893</a></li>
+<li><a href="http://markmail.org/thread/33h5nhk5e3mswrue">Mail list discussion</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/project-information/apache-sling-community-roles-and-processes.html
==============================================================================
--- websites/staging/sling/trunk/content/project-information/apache-sling-community-roles-and-processes.html (original)
+++ websites/staging/sling/trunk/content/project-information/apache-sling-community-roles-and-processes.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/project-information/project-license.html
==============================================================================
--- websites/staging/sling/trunk/content/project-information/project-license.html (original)
+++ websites/staging/sling/trunk/content/project-information/project-license.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/project-information/project-team.html
==============================================================================
--- websites/staging/sling/trunk/content/project-information/project-team.html (original)
+++ websites/staging/sling/trunk/content/project-information/project-team.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"

Added: websites/staging/sling/trunk/content/res/pygments-friendly.css
==============================================================================
--- websites/staging/sling/trunk/content/res/pygments-friendly.css (added)
+++ websites/staging/sling/trunk/content/res/pygments-friendly.css Sun Jul  7 18:50:10 2013
@@ -0,0 +1,269 @@
+/**
+ * Pygments Code Formatter Styles
+ * from https://bitbucket.org/birkenfeld/pygments-main/src/5cc94956e233/pygments/styles/friendly.py
+ *
+ * This CSS is not currently in use
+ */
+ 
+/** Whitespace */
+.codehilite .w {
+    color: #bbbbbb;
+}
+/** Error */
+.codehilite .err {
+    border: 1px solid #ff0000;
+}
+/** Other */
+.codehilite .x {
+}
+/** Keyword */
+.codehilite .k {
+    font-style: bold;
+    color: #007020;
+}
+/** Keyword.Constant */
+.codehilite .kc {
+}
+/** Keyword.Declaration */
+.codehilite .kd {
+}
+/** Keyword.Namespace */
+.codehilite .kn {
+}
+/** Keyword.Pseudo */
+.codehilite .kp {
+    font-style: nobold;
+}
+/** Keyword.Reserved */
+.codehilite .kr {
+}
+/** Keyword.Type */
+.codehilite .kt {
+    font-style: nobold;
+    color: #902000;
+}
+/** Name */
+.codehilite .n {
+}
+/** Name.Attribute */
+.codehilite .na {
+}
+/** Name.Builtin */
+.codehilite .nb {
+    color: #007020;
+}
+/** Name.Builtin.Pseudo */
+.codehilite .bp {
+}
+/** Name.Class */
+.codehilite .nc {
+    font-style: bold;
+    color: #0e84b5;
+}
+/** Name.Constant */
+.codehilite .no {
+    color: #60add5;
+}
+/** Name.Decorator */
+.codehilite .nd {
+    font-style: bold;
+    color: #555555;
+}
+/** Name.Entity */
+.codehilite .ni {
+    font-style: bold;
+    color: #d55537;
+}
+/** Name.Exception */
+.codehilite .ne {
+    color: #007020;
+}
+/** Name.Function */
+.codehilite .nf {
+    color: #06287e;
+}
+/** Name.Property */
+.codehilite .py {
+}
+/** Name.Label */
+.codehilite .nl {
+    font-style: bold;
+    color: #002070;
+}
+/** Name.Namespace */
+.codehilite .nn {
+    font-style: bold;
+    color: #0e84b5;
+}
+/** Name.Other */
+.codehilite .nx {
+}
+/** Name.Tag */
+.codehilite .nt {
+    font-style: bold;
+    color: #062873;
+}
+/** Name.Variable */
+.codehilite .nv {
+    color: #bb60d5;
+}
+/** Name.Variable.Class */
+.codehilite .vc {
+}
+/** Name.Variable.Global */
+.codehilite .vg {
+}
+/** Name.Variable.Instance */
+.codehilite .vi {
+}
+/** Literal */
+.codehilite .l {
+}
+/** Literal.Date */
+.codehilite .ld {
+}
+/** String */
+.codehilite .s {
+    color: #4070a0;
+}
+/** String.Backtick */
+.codehilite .sb {
+}
+/** String.Char */
+.codehilite .sc {
+}
+/** String.Doc */
+.codehilite .sd {
+    font-style: italic;
+}
+/** String.Double */
+.codehilite .s2 {
+}
+/** String.Escape */
+.codehilite .se {
+    font-style: bold;
+    color: #4070a0;
+}
+/** String.Heredoc */
+.codehilite .sh {
+}
+/** String.Interpol */
+.codehilite .si {
+    font-style: italic;
+    color: #70a0d0;
+}
+/** String.Other */
+.codehilite .sx {
+    color: #c65d09;
+}
+/** String.Regex */
+.codehilite .sr {
+    color: #235388;
+}
+/** String.Single */
+.codehilite .s1 {
+}
+/** String.Symbol */
+.codehilite .ss {
+    color: #517918;
+}
+/** Number */
+.codehilite .m {
+    color: #40a070;
+}
+/** Number.Float */
+.codehilite .mf {
+}
+/** Number.Hex */
+.codehilite .mh {
+}
+/** Number.Integer */
+.codehilite .mi {
+}
+/** Number.Integer.Long */
+.codehilite .il {
+}
+/** Number.Oct */
+.codehilite .mo {
+}
+/** Operator */
+.codehilite .o {
+    color: #666666;
+}
+/** Operator.Word */
+.codehilite .ow {
+    font-style: bold;
+    color: #007020;
+}
+/** Punctuation */
+.codehilite .p {
+}
+/** Comment */
+.codehilite .c {
+    color: #60a0b0;
+    font-style: italic;
+}
+/** Comment.Multiline */
+.codehilite .cm {
+}
+/** Comment.Preproc */
+.codehilite .cp {
+    color: #007020;
+    font-style: noitalic;
+}
+/** Comment.Single */
+.codehilite .c1 {
+}
+/** Comment.Special */
+.codehilite .cs {
+    background-color: #fff0f0;
+    font-style: noitalic;
+}
+/** Generic */
+.codehilite .g {
+}
+/** Generic.Deleted */
+.codehilite .gd {
+    color: #a00000;
+}
+/** Generic.Emph */
+.codehilite .ge {
+    font-style: italic;
+}
+/** Generic.Error */
+.codehilite .gr {
+    color: #ff0000;
+    }
+/** Generic.Heading */
+.codehilite .gh {
+    font-style: bold;
+    color: #000080;
+}
+/** Generic.Inserted */
+.codehilite .gi {
+    color: #00a000;
+    }
+/** Generic.Output */
+.codehilite .go {
+    color: #888;
+}
+/** Generic.Prompt */
+.codehilite .gp {
+    font-style: bold;
+    color: #c65d09;
+}
+/** Generic.Strong */
+.codehilite .gs {
+    font-style: bold;
+}
+/** Generic.Subheading */
+.codehilite .gu {
+    font-style: bold;
+    color: #800080;
+    }
+/** Generic.Traceback */
+.codehilite .gt {
+    color: #04d;
+}
+
+

Modified: websites/staging/sling/trunk/content/site-conversion.html
==============================================================================
--- websites/staging/sling/trunk/content/site-conversion.html (original)
+++ websites/staging/sling/trunk/content/site-conversion.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"



Mime
View raw message