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 [1/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
Author: buildbot
Date: Wed Jul  3 07:40:20 2013
New Revision: 868241

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/contributing.html
    websites/staging/sling/trunk/content/documentation.html
    websites/staging/sling/trunk/content/documentation/bundles.html
    websites/staging/sling/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.html
    websites/staging/sling/trunk/content/documentation/bundles/commons-html-utilities.html
    websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
    websites/staging/sling/trunk/content/documentation/bundles/jcr-installer-provider.html
    websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.html
    websites/staging/sling/trunk/content/documentation/bundles/scheduler-service-commons-scheduler.html
    websites/staging/sling/trunk/content/documentation/bundles/web-console-extensions.html
    websites/staging/sling/trunk/content/documentation/configuration.html
    websites/staging/sling/trunk/content/documentation/development/client-request-logging.html
    websites/staging/sling/trunk/content/documentation/development/dependency-management.html
    websites/staging/sling/trunk/content/documentation/development/embedding-sling.html
    websites/staging/sling/trunk/content/documentation/development/getting-and-building-sling.html
    websites/staging/sling/trunk/content/documentation/development/issue-tracker.html
    websites/staging/sling/trunk/content/documentation/development/jspc.html
    websites/staging/sling/trunk/content/documentation/development/logging.html
    websites/staging/sling/trunk/content/documentation/development/maven-archetypes.html
    websites/staging/sling/trunk/content/documentation/development/maven-launchpad-plugin.html
    websites/staging/sling/trunk/content/documentation/development/maventipsandtricks.html
    websites/staging/sling/trunk/content/documentation/development/release-management.html
    websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
    websites/staging/sling/trunk/content/documentation/development/sling.html
    websites/staging/sling/trunk/content/documentation/development/version-policy.html
    websites/staging/sling/trunk/content/documentation/getting-started.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/architecture.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/default-mapping-and-rendering.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/dispatching-requests.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/errorhandling.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/eventing-and-jobs.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/mappings-for-resource-resolution.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/request-listeners.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/request-parameters.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/url-decomposition.html
    websites/staging/sling/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.html
    websites/staging/sling/trunk/content/documentation/tutorials-how-tos.html
    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/installing-and-upgrading-bundles.html
    websites/staging/sling/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.html
    websites/staging/sling/trunk/content/guides.html
    websites/staging/sling/trunk/content/index.html
    websites/staging/sling/trunk/content/links.html
    websites/staging/sling/trunk/content/media.html
    websites/staging/sling/trunk/content/old-stuff.html
    websites/staging/sling/trunk/content/old-stuff/assembly.html
    websites/staging/sling/trunk/content/old-stuff/launch-sling.html
    websites/staging/sling/trunk/content/old-stuff/request-processing.html
    websites/staging/sling/trunk/content/old-stuff/scriptengineintegration.html
    websites/staging/sling/trunk/content/old-stuff/scriptengineintegration/groovy-support.html
    websites/staging/sling/trunk/content/old-stuff/scriptengineintegration/xslt-processing-pipeline.html
    websites/staging/sling/trunk/content/old-stuff/servlet-resolution.html
    websites/staging/sling/trunk/content/old-stuff/sling-api.html
    websites/staging/sling/trunk/content/plugins.html
    websites/staging/sling/trunk/content/project-information.html
    websites/staging/sling/trunk/content/project-information/security.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jul  3 07:40:20 2013
@@ -1 +1 @@
-1499237
+1499238

Modified: websites/staging/sling/trunk/content/contributing.html
==============================================================================
--- websites/staging/sling/trunk/content/contributing.html (original)
+++ websites/staging/sling/trunk/content/contributing.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/contributing.html" target="sling_cwiki">/site/contributing.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Contributing</h1>
       <p>See <a href="/project-information.html">Project Information</a> for details about the tools mentioned below.</p>
@@ -97,7 +99,7 @@
 <h2 id="programmers">Programmers</h2>
 <p>Implement support for various rendering technologies in Sling. Examples coming to mind are JSF and Wicket.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1420559 by fmeschbe on Wed, 12 Dec 2012 08:11:12 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation.html (original)
+++ websites/staging/sling/trunk/content/documentation.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"
@@ -145,22 +142,22 @@ where the source is kept in SVN at <a hr
 <p>This section lists some Apache Sling features to help with the maintenance
 of the site, such as automatic link generation.</p>
 <p>Start the file with a <code>Title:</code> line to define the page title and the first H1 tag:</p>
-<div class="codehilite"><pre><span class="err">Title:</span> <span class="err">Page</span> <span class="err">Title</span>
+<div class="codehilite"><pre><span class="n">Title</span><span class="o">:</span> <span class="n">Page</span> <span class="n">Title</span>
 
-<span class="err">Here</span> <span class="err">comes</span> <span class="err">the</span> <span class="err">content</span> <span class="err">separated</span> <span class="err">with</span> <span class="err">a</span> <span class="err">blank</span> <span class="err">like</span> <span class="err">from</span> <span class="err">the</span>
-<span class="err">header</span> <span class="err">...</span>
+<span class="n">Here</span> <span class="n">comes</span> <span class="n">the</span> <span class="n">content</span> <span class="n">separated</span> <span class="k">with</span> <span class="n">a</span> <span class="n">blank</span> <span class="n">like</span> <span class="n">from</span> <span class="n">the</span>
+<span class="n">header</span> <span class="o">...</span>
 </pre></div>
 
 
 <p>The last modification information from SVN (revision, committer, and
 date/time) is automatically added when the page is rendered</p>
 <p>Excerpts can be added to a page using the <code>Excerpt:</code> header:</p>
-<div class="codehilite"><pre><span class="err">Title:</span> <span class="err">Page</span> <span class="err">Title</span>
-<span class="err">Excerpt:</span> <span class="err">Summary</span> <span class="err">of</span> <span class="err">the</span> <span class="err">page</span> <span class="err">for</span> <span class="err">inclusion</span> <span class="err">in</span> <span class="err">other</span> <span class="err">pages;</span>
-   <span class="err">continuation</span> <span class="err">of</span> <span class="err">the</span> <span class="err">excerpt</span> <span class="err">must</span> <span class="err">be</span> <span class="err">indented</span>
+<div class="codehilite"><pre><span class="n">Title</span><span class="o">:</span> <span class="n">Page</span> <span class="n">Title</span>
+<span class="n">Excerpt</span><span class="o">:</span> <span class="n">Summary</span> <span class="n">of</span> <span class="n">the</span> <span class="n">page</span> <span class="k">for</span> <span class="n">inclusion</span> <span class="k">in</span> <span class="n">other</span> <span class="n">pages</span><span class="o">;</span>
+   <span class="n">continuation</span> <span class="n">of</span> <span class="n">the</span> <span class="n">excerpt</span> <span class="n">must</span> <span class="n">be</span> <span class="n">indented</span>
 
-<span class="err">Here</span> <span class="err">comes</span> <span class="err">the</span> <span class="err">content</span> <span class="err">separated</span> <span class="err">with</span> <span class="err">a</span> <span class="err">blank</span> <span class="err">like</span> <span class="err">from</span> <span class="err">the</span>
-<span class="err">header</span> <span class="err">...</span>
+<span class="n">Here</span> <span class="n">comes</span> <span class="n">the</span> <span class="n">content</span> <span class="n">separated</span> <span class="k">with</span> <span class="n">a</span> <span class="n">blank</span> <span class="n">like</span> <span class="n">from</span> <span class="n">the</span>
+<span class="n">header</span> <span class="o">...</span>
 </pre></div>
 
 
@@ -187,32 +184,38 @@ it through the page template.</p>
 <p>All pages in the children namespace are also available in the refs namespace</p>
 <p>Some usefull hints:</p>
 <p>Printing title of another page "handler":</p>
-<div class="codehilite"><pre><span class="x">   </span><span class="cp">{{</span> <span class="nv">refs.handler.headers.title</span> <span class="cp">}}</span><span class="x"></span>
+<div class="codehilite"><pre><span class="x">   :::django</span>
+<span class="x">   </span><span class="cp">{{</span> <span class="nv">refs.handler.headers.title</span> <span class="cp">}}</span><span class="x"></span>
 </pre></div>
 
 
 <p>Printing excerpt of another page "handler":</p>
-<div class="codehilite"><pre><span class="x">   </span><span class="cp">{{</span> <span class="nv">refs.handler.headers.excerpt</span> <span class="cp">}}</span><span class="x"></span>
+<div class="codehilite"><pre><span class="x">   :::django</span>
+<span class="x">   </span><span class="cp">{{</span> <span class="nv">refs.handler.headers.excerpt</span> <span class="cp">}}</span><span class="x"></span>
 </pre></div>
 
 
 <p>Linking to another page "handler":</p>
-<div class="codehilite"><pre><span class="x">   (</span><span class="cp">{{</span> <span class="nv">refs.handler.path</span> <span class="cp">}}</span><span class="x">)</span>
+<div class="codehilite"><pre><span class="x">   :::django</span>
+<span class="x">   (</span><span class="cp">{{</span> <span class="nv">refs.handler.path</span> <span class="cp">}}</span><span class="x">)</span>
 </pre></div>
 
 
 <p>Printing title as a link to another page "handler":</p>
-<div class="codehilite"><pre><span class="x">   [</span><span class="cp">{{</span> <span class="nv">refs.handler.headers.title</span> <span class="cp">}}</span><span class="x">](</span><span class="cp">{{</span> <span class="nv">refs.handler.path</span> <span class="cp">}}</span><span class="x">)</span>
+<div class="codehilite"><pre><span class="x">   :::django</span>
+<span class="x">   [</span><span class="cp">{{</span> <span class="nv">refs.handler.headers.title</span> <span class="cp">}}</span><span class="x">](</span><span class="cp">{{</span> <span class="nv">refs.handler.path</span> <span class="cp">}}</span><span class="x">)</span>
 </pre></div>
 
 
 <p>Printing excerpt as a link to another page "handler":</p>
-<div class="codehilite"><pre><span class="x">   [</span><span class="cp">{{</span> <span class="nv">refs.handler.headers.excerpt</span> <span class="cp">}}</span><span class="x">](</span><span class="cp">{{</span> <span class="nv">refs.handler.path</span> <span class="cp">}}</span><span class="x">)</span>
+<div class="codehilite"><pre><span class="x">   :::django</span>
+<span class="x">   [</span><span class="cp">{{</span> <span class="nv">refs.handler.headers.excerpt</span> <span class="cp">}}</span><span class="x">](</span><span class="cp">{{</span> <span class="nv">refs.handler.path</span> <span class="cp">}}</span><span class="x">)</span>
 </pre></div>
 
 
 <p>Print a bullet pointed child page list:</p>
-<div class="codehilite"><pre><span class="x">   </span><span class="cp">{%</span> <span class="k">for</span> <span class="nv">label</span><span class="o">,</span> <span class="nv">page</span> <span class="k">in</span> <span class="nv">children</span> <span class="cp">%}</span><span class="x">* [</span><span class="cp">{{</span> <span class="nv">page.headers.title</span> <span class="cp">}}</span><span class="x">](</span><span class="cp">{{</span> <span class="nv">page.path</span> <span class="cp">}}</span><span class="x">)</span>
+<div class="codehilite"><pre><span class="x">   :::django</span>
+<span class="x">   </span><span class="cp">{%</span> <span class="k">for</span> <span class="nv">label</span><span class="o">,</span> <span class="nv">page</span> <span class="k">in</span> <span class="nv">children</span> <span class="cp">%}</span><span class="x">* [</span><span class="cp">{{</span> <span class="nv">page.headers.title</span> <span class="cp">}}</span><span class="x">](</span><span class="cp">{{</span> <span class="nv">page.path</span> <span class="cp">}}</span><span class="x">)</span>
 <span class="x">   </span><span class="cp">{%</span> <span class="k">endfor</span> <span class="cp">%}</span><span class="x"></span>
 </pre></div>
 
@@ -263,8 +266,8 @@ and <code>build_file.pl</code> scripts t
 <h2 id="the-javadoc">The JavaDoc</h2>
 <p>Up until now the JavaDoc of the Sling Bundles has not been published.</p>
 <p>I just polished the JavaDoc generation setup of Sling a bit, so that I could generate a first shot of aggregate JavaDocs. This draft can currently be found on my site at http://people.apache.org/~fmeschbe/slingdocs.762729/. This JavaDoc has been generated as follows:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">export</span> <span class="o">-</span><span class="n">r</span> <span class="mi">762729</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">/incubator/s</span><span class="n">ling</span><span class="o">/</span><span class="n">trunk</span> <span class="n">sling</span>
-<span class="nv">$</span> <span class="nv">mvn</span> <span class="o">-</span><span class="n">DexcludePackageNames</span><span class="o">=</span><span class="s">&quot;*.impl:*.internal:*.jsp:sun.misc:*.juli&quot;</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">maven</span><span class="o">.</span><span class="n">plugins:maven</span><span class="o">-</span><span class="n">javadoc</span><span class="o">-</span><span class="n">plugin:2</span><span class="mf">.5</span><span class="p">:</span><span class="n">aggregate</span>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">export</span> <span class="o">-</span><span class="n">r</span> 762729 <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">incubator</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">trunk</span> <span class="n">sling</span>
+$ <span class="n">mvn</span> <span class="o">-</span><span class="n">DexcludePackageNames</span><span class="p">=</span>&quot;<span class="o">*</span><span class="p">.</span><span class="n">impl</span><span class="p">:</span><span class="o">*</span><span class="p">.</span><span class="n">internal</span><span class="p">:</span><span class="o">*</span><span class="p">.</span><span class="n">jsp</span><span class="p">:</span><span class="n">sun</span><span class="p">.</span><span class="n">misc</span><span class="p">:</span><span class="o">*</span><span class="p">.</span><span class="n">juli</span>&quot; <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">maven</span><span class="p">.</span><span class="n">plugins</span><span class="p">:</span><span class="n">maven</span><span class="o">-</span><span class="n">javadoc</span><span class="o">-</span><span class="n">plugin</span><span class="p">:</span>2<span class="p">.</
 span>5<span class="p">:</span><span class="n">aggregate</span>
 </pre></div>
 
 
@@ -291,7 +294,7 @@ and <code>build_file.pl</code> scripts t
 </tbody>
 </table>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475804 by dklco on Thu, 25 Apr 2013 14:45:50 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

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

Modified: websites/staging/sling/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.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/apache-sling-eventing-and-job-handling.html" target="sling_cwiki">/site/apache-sling-eventing-and-job-handling.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Apache Sling Eventing and Job Handling</h1>
       <p><em>NOTE: This documentation is work in progress!</em></p>
@@ -245,7 +247,7 @@
 <h2 id="scheduling">Scheduling</h2>
 <p>The scheduler is a service which uses the open source Quartz library. The scheduler has methods to start jobs periodically or with a cron definition. In addition, a service either implementing <em>java.lang.Runnable</em> or <em>org.quartz.job</em> is started through the whiteboard pattern <em>if</em> it either contains a configuration property <em>scheduler.expression</em> or <em>scheduler.period</em>. The job is started with the ~PID of the service - if the service has no PID, the configuration property <em>scheduler.name</em> must be set.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475862 by dklco on Thu, 25 Apr 2013 17:28:38 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/bundles/commons-html-utilities.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/commons-html-utilities.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/commons-html-utilities.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/commons-html-utilities.html" target="sling_cwiki">/site/commons-html-utilities.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Commons HTML Utilities</h1>
       <p>The Apache Sling Commons HTML Utilities bundle provides an HTML parser which can be used to parse HTML and either generate a DOM or SAX events out of the HTML. Therefore the parser transforms the HTML into proper XHTML.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341376 by fmeschbe on Tue, 22 May 2012 09:41:06 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.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/internationalization-support-i18n.html" target="sling_cwiki">/site/internationalization-support-i18n.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Internationalization Support (i18n)</h1>
       <p>Internationalization support in Sling consists of four methods in the <code>SlingHttpServletRequest</code> interface:</p>
@@ -151,58 +153,62 @@
 <p>The <code>sling:basename</code> property may be multi-valued, that is the messages of a <code>mix:language</code> nodes may belong to multiple base names and thus <code>ResourceBundle</code> instances.</p>
 <h3 id="sample-resources">Sample Resources</h3>
 <p>Consider the following repository content:</p>
-<div class="codehilite"><pre>   <span class="sr">/libs/</span><span class="n">languages</span>
-           <span class="o">+--</span> <span class="n">English</span> <span class="p">(</span><span class="n">nt:folder</span><span class="p">,</span> <span class="n">mix:language</span><span class="p">)</span>
-           <span class="o">|</span>    <span class="o">+--</span> <span class="n">jcr:language</span> <span class="o">=</span> <span class="n">en</span>
-           <span class="o">|</span>    <span class="o">+--</span> <span class="n">m1</span> <span class="p">(</span><span class="n">sling:messageEntry</span><span class="p">)</span>
-           <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span> <span class="n">sling:key</span> <span class="o">=</span> <span class="s">&quot;msg001&quot;</span>
-           <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span> <span class="n">slign:message</span> <span class="o">=</span> <span class="s">&quot;This is a message&quot;</span>
-           <span class="o">|</span>    <span class="o">+--</span> <span class="n">m2</span> <span class="p">(</span><span class="n">sling:messageEntry</span><span class="p">)</span>
-           <span class="o">|</span>         <span class="o">+--</span> <span class="n">sling:key</span> <span class="o">=</span> <span class="s">&quot;msg002&quot;</span>
-           <span class="o">|</span>         <span class="o">+--</span> <span class="n">slign:message</span> <span class="o">=</span> <span class="s">&quot;Another message&quot;</span>
-           <span class="o">+--</span> <span class="n">Deutsch</span> <span class="p">(</span><span class="n">nt:folder</span><span class="p">,</span> <span class="n">mix:language</span><span class="p">)</span>
-                <span class="o">+--</span> <span class="n">jcr:language</span> <span class="o">=</span> <span class="n">de</span>
-                <span class="o">+--</span> <span class="n">m1</span> <span class="p">(</span><span class="n">sling:messageEntry</span><span class="p">)</span>
-                <span class="o">|</span>    <span class="o">+--</span> <span class="n">sling:key</span> <span class="o">=</span> <span class="s">&quot;msg001&quot;</span>
-                <span class="o">|</span>    <span class="o">+--</span> <span class="n">slign:message</span> <span class="o">=</span> <span class="s">&quot;Das ist ein Text&quot;</span>
-                <span class="o">+--</span> <span class="n">m2</span> <span class="p">(</span><span class="n">sling:messageEntry</span><span class="p">)</span>
-                     <span class="o">+--</span> <span class="n">sling:key</span> <span class="o">=</span> <span class="s">&quot;msg002&quot;</span>
-                     <span class="o">+--</span> <span class="n">slign:message</span> <span class="o">=</span> <span class="s">&quot;Ein anderer Text&quot;</span>
-
-   <span class="sr">/apps/m</span><span class="n">yApp</span>
-           <span class="o">+--</span> <span class="n">English</span> <span class="p">(</span><span class="n">nt:folder</span><span class="p">,</span> <span class="n">mix:language</span><span class="p">)</span>
-           <span class="o">|</span>    <span class="o">+--</span> <span class="n">jcr:language</span> <span class="o">=</span> <span class="n">en</span>
-           <span class="o">|</span>    <span class="o">+--</span> <span class="n">mx</span> <span class="p">(</span><span class="n">sling:messageEntry</span><span class="p">)</span>
-           <span class="o">|</span>         <span class="o">+--</span> <span class="n">sling:key</span> <span class="o">=</span> <span class="s">&quot;msgXXX&quot;</span>
-           <span class="o">|</span>         <span class="o">+--</span> <span class="n">slign:message</span> <span class="o">=</span> <span class="s">&quot;An Application Text&quot;</span>
-           <span class="o">+--</span> <span class="n">Deutsch</span> <span class="p">(</span><span class="n">nt:folder</span><span class="p">,</span> <span class="n">mix:language</span><span class="p">)</span>
-                <span class="o">+--</span> <span class="n">jcr:language</span> <span class="o">=</span> <span class="n">de</span>
-                <span class="o">+--</span> <span class="n">mx</span> <span class="p">(</span><span class="n">sling:messageEntry</span><span class="p">)</span>
-                     <span class="o">+--</span> <span class="n">sling:key</span> <span class="o">=</span> <span class="s">&quot;msgXXX&quot;</span>
-                     <span class="o">+--</span> <span class="n">slign:message</span> <span class="o">=</span> <span class="s">&quot;Ein Anwendungstext&quot;</span>
+<div class="codehilite"><pre>   <span class="o">/</span><span class="n">libs</span><span class="o">/</span><span class="n">languages</span>
+           <span class="o">+--</span> <span class="n">English</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">mix</span><span class="p">:</span><span class="n">language</span><span class="p">)</span>
+           <span class="o">|</span>    <span class="o">+--</span> <span class="n">jcr</span><span class="p">:</span><span class="n">language</span> <span class="p">=</span> <span class="n">en</span>
+           <span class="o">|</span>    <span class="o">+--</span> <span class="n">m1</span> <span class="p">(</span><span class="n">sling</span><span class="p">:</span><span class="n">messageEntry</span><span class="p">)</span>
+           <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">key</span> <span class="p">=</span> &quot;<span class="n">msg001</span>&quot;
+           <span class="o">|</span>    <span class="o">|</span>    <span class="o">+--</span> <span class="n">slign</span><span class="p">:</span><span class="n">message</span> <span class="p">=</span> &quot;<span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">message</span>&quot;
+           <span class="o">|</span>    <span class="o">+--</span> <span class="n">m2</span> <span class="p">(</span><span class="n">sling</span><span class="p">:</span><span class="n">messageEntry</span><span class="p">)</span>
+           <span class="o">|</span>         <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">key</span> <span class="p">=</span> &quot;<span class="n">msg002</span>&quot;
+           <span class="o">|</span>         <span class="o">+--</span> <span class="n">slign</span><span class="p">:</span><span class="n">message</span> <span class="p">=</span> &quot;<span class="n">Another</span> <span class="n">message</span>&quot;
+           <span class="o">+--</span> <span class="n">Deutsch</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">mix</span><span class="p">:</span><span class="n">language</span><span class="p">)</span>
+                <span class="o">+--</span> <span class="n">jcr</span><span class="p">:</span><span class="n">language</span> <span class="p">=</span> <span class="n">de</span>
+                <span class="o">+--</span> <span class="n">m1</span> <span class="p">(</span><span class="n">sling</span><span class="p">:</span><span class="n">messageEntry</span><span class="p">)</span>
+                <span class="o">|</span>    <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">key</span> <span class="p">=</span> &quot;<span class="n">msg001</span>&quot;
+                <span class="o">|</span>    <span class="o">+--</span> <span class="n">slign</span><span class="p">:</span><span class="n">message</span> <span class="p">=</span> &quot;<span class="n">Das</span> <span class="n">ist</span> <span class="n">ein</span> <span class="n">Text</span>&quot;
+                <span class="o">+--</span> <span class="n">m2</span> <span class="p">(</span><span class="n">sling</span><span class="p">:</span><span class="n">messageEntry</span><span class="p">)</span>
+                     <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">key</span> <span class="p">=</span> &quot;<span class="n">msg002</span>&quot;
+                     <span class="o">+--</span> <span class="n">slign</span><span class="p">:</span><span class="n">message</span> <span class="p">=</span> &quot;<span class="n">Ein</span> <span class="n">anderer</span> <span class="n">Text</span>&quot;
+
+   <span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">myApp</span>
+           <span class="o">+--</span> <span class="n">English</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">mix</span><span class="p">:</span><span class="n">language</span><span class="p">)</span>
+           <span class="o">|</span>    <span class="o">+--</span> <span class="n">jcr</span><span class="p">:</span><span class="n">language</span> <span class="p">=</span> <span class="n">en</span>
+           <span class="o">|</span>    <span class="o">+--</span> <span class="n">mx</span> <span class="p">(</span><span class="n">sling</span><span class="p">:</span><span class="n">messageEntry</span><span class="p">)</span>
+           <span class="o">|</span>         <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">key</span> <span class="p">=</span> &quot;<span class="n">msgXXX</span>&quot;
+           <span class="o">|</span>         <span class="o">+--</span> <span class="n">slign</span><span class="p">:</span><span class="n">message</span> <span class="p">=</span> &quot;<span class="n">An</span> <span class="n">Application</span> <span class="n">Text</span>&quot;
+           <span class="o">+--</span> <span class="n">Deutsch</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">mix</span><span class="p">:</span><span class="n">language</span><span class="p">)</span>
+                <span class="o">+--</span> <span class="n">jcr</span><span class="p">:</span><span class="n">language</span> <span class="p">=</span> <span class="n">de</span>
+                <span class="o">+--</span> <span class="n">mx</span> <span class="p">(</span><span class="n">sling</span><span class="p">:</span><span class="n">messageEntry</span><span class="p">)</span>
+                     <span class="o">+--</span> <span class="n">sling</span><span class="p">:</span><span class="n">key</span> <span class="p">=</span> &quot;<span class="n">msgXXX</span>&quot;
+                     <span class="o">+--</span> <span class="n">slign</span><span class="p">:</span><span class="n">message</span> <span class="p">=</span> &quot;<span class="n">Ein</span> <span class="n">Anwendungstext</span>&quot;
 </pre></div>
 
 
 <p>This content defines two languages <em>en</em> and <em>de</em> with three messages <em>msg001</em>, <em>msg002</em> and <em>msgXXX</em> each. The names of the respective nodes have no significance at all because all information required is extracted from the <code>jcr:language</code>, <code>sling:key</code> and <code>sling:message</code> properties.</p>
 <h3 id="jcr-node-types-supporting-the-jcr-repository-based-resourcebundleprovider">JCR Node Types supporting the JCR Repository based <code>ResourceBundleProvider</code></h3>
 <p>The sling.i18n bundle asserts the following node types:</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>mix:language</B></DIV><DIV class="codeContent panelContent">
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>mix:language</B></DIV><DIV class="codeContent panelContent">
     [mix:language]
         mixin
-      - jcr:language (string)</p>
-<p>The <code>mix:language</code> mixin node type allows setting the <code>jcr:language</code> property required by the <code>ResourceBundleProvider</code> implementation to identify the message <code>Locale</code>.</p>
-<p><DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sling:message and sling:messageEntry</B></DIV><DIV class="codeContent panelContent">
+      - jcr:language (string)
+
+The `mix:language` mixin node type allows setting the `jcr:language` property required by the `ResourceBundleProvider` implementation to identify the message `Locale`.
+
+
+
+<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>sling:message and sling:messageEntry</B></DIV><DIV class="codeContent panelContent">
     [sling:message]
         mixin
       - sling:key (string)
-      - sling:message (undefined)</p>
-<div class="codehilite"><pre><span class="p">[</span><span class="n">sling:messageEntry</span><span class="p">]</span> <span class="o">&gt;</span> <span class="n">nt:hierarchyNode</span><span class="p">,</span> <span class="n">sling:message</span>
-</pre></div>
+      - sling:message (undefined)
+
+    [sling:messageEntry] > nt:hierarchyNode, sling:message  
 
 
-<p>The <code>sling:message</code> and <code>slign:messageEntry</code> are helper node types which may be used to create the nodes with the <code>sling:key</code> and <code>sling:message</code> properties required by the <code>ResourceBundleProvider</code>. The node types themselves are not required but by defining the required properties, they may be of use.</p>
+The `sling:message` and `slign:messageEntry` are helper node types which may be used to create the nodes with the `sling:key` and `sling:message` properties required by the `ResourceBundleProvider`. The node types themselves are not required but by defining the required properties, they may be of use.
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341376 by fmeschbe on Tue, 22 May 2012 09:41:06 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/bundles/jcr-installer-provider.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/jcr-installer-provider.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/jcr-installer-provider.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/jcr-installer-provider.html" target="sling_cwiki">/site/jcr-installer-provider.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>JCR Installer Provider</h1>
       <p>The JCR installer provider scans the JCR repository for artifacts and provides them to the <a href="/documentation/bundles/osgi-installer.html">OSGI installer</a>.</p>
@@ -108,21 +110,21 @@
 <p>We'll use the <a href="http://www.knopflerfish.org/releases/2.0.5/jars/desktop_awt/desktop_awt_all-2.0.0.jar">Knopflerfish Desktop</a> bundle for this example, it is convenient as it displays a graphical user interface when started.</p>
 <p>We use <code>curl</code> to create content, to make it easy to reproduce the example by copying and pasting the <code>curl</code> commands. Any other way to create content in the repository will work, of course.</p>
 <p>By default, JCRInstall picks up bundles found in folders named <em>install</em> under <code>/libs</code> and <code>/apps</code>, so we start by creating such a folder:</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span>  <span class="n">http:</span><span class="sr">//</span><span class="n">admin:admin</span><span class="nv">@localhost:8888</span><span class="sr">/apps/</span><span class="n">jcrtest</span>
-<span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span>  <span class="n">http:</span><span class="sr">//</span><span class="n">admin:admin</span><span class="nv">@localhost:8888</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span>  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">admin</span><span class="p">:</span><span class="n">admin</span><span class="p">@</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span>
+<span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">MKCOL</span>  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">admin</span><span class="p">:</span><span class="n">admin</span><span class="p">@</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span>
 </pre></div>
 
 
 <p>And we copy the bundle to install in that folder (a backslash in command lines means <em>continued on next line</em>):</p>
-<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">T</span> <span class="n">desktop_awt_all</span><span class="o">-</span><span class="mf">2.0.0</span><span class="o">.</span><span class="n">jar</span> <span class="o">\</span>
-  <span class="n">http:</span><span class="sr">//</span><span class="n">admin:admin</span><span class="nv">@localhost:8888</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="sr">/install/</span><span class="n">desktop_awt_all</span><span class="o">-</span><span class="mf">2.0.0</span><span class="o">.</span><span class="n">jar</span>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">T</span> <span class="n">desktop_awt_all</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span> <span class="o">\</span>
+  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">admin</span><span class="p">:</span><span class="n">admin</span><span class="p">@</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span><span class="o">/</span><span class="n">desktop_awt_all</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span>
 </pre></div>
 
 
 <p>That's it. After 2-3 seconds, the bundle should be picked up by JCRInstall, installed and started. If this works you'll see a small <em>Knopflerfish Desktop</em> window on your desktop, and Sling's OSGi console can of course be used to check the details.</p>
 <p>Removing the bundle from the repository will cause it to be uninstalled, so:</p>
 <div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">DELETE</span> <span class="o">\</span>
-  <span class="n">http:</span><span class="sr">//</span><span class="n">admin:admin</span><span class="nv">@localhost:8888</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="sr">/install/</span><span class="n">desktop_awt_all</span><span class="o">-</span><span class="mf">2.0.0</span><span class="o">.</span><span class="n">jar</span>
+  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">admin</span><span class="p">:</span><span class="n">admin</span><span class="p">@</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span><span class="o">/</span><span class="n">desktop_awt_all</span><span class="o">-</span>2<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span>
 </pre></div>
 
 
@@ -131,57 +133,57 @@
 <p>JCRInstall installs OSGi configurations from nodes having the <em>sling:OsgiConfig</em> node type, found in folders named <em>install</em> under the installation roots (/apps and /libs).</p>
 <p>Let's try this feature by creating a configuration with two properties:</p>
 <div class="codehilite"><pre><span class="n">curl</span> <span class="o">\</span>
-  <span class="o">-</span><span class="n">F</span> <span class="s">&quot;jcr:primaryType=sling:OsgiConfig&quot;</span> <span class="o">\</span>
-  <span class="o">-</span><span class="n">F</span> <span class="n">foo</span><span class="o">=</span><span class="n">bar</span> <span class="o">-</span><span class="n">F</span> <span class="n">works</span><span class="o">=</span><span class="n">yes</span> <span class="o">\</span>
-  <span class="n">http:</span><span class="sr">//</span><span class="n">admin:admin</span><span class="nv">@localhost:8888</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="sr">/install/som</span><span class="n">e</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
+  <span class="o">-</span><span class="n">F</span> &quot;<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">OsgiConfig</span>&quot; <span class="o">\</span>
+  <span class="o">-</span><span class="n">F</span> <span class="n">foo</span><span class="p">=</span><span class="n">bar</span> <span class="o">-</span><span class="n">F</span> <span class="n">works</span><span class="p">=</span><span class="n">yes</span> <span class="o">\</span>
+  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">admin</span><span class="p">:</span><span class="n">admin</span><span class="p">@</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span><span class="o">/</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
 </pre></div>
 
 
 <p>And verify the contents of our config node:</p>
 <div class="codehilite"><pre><span class="n">curl</span> <span class="o">\</span>
-  <span class="n">http:</span><span class="sr">//</span><span class="n">admin:admin</span><span class="nv">@localhost:8888</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="sr">/install/som</span><span class="n">e</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span><span class="o">.</span><span class="n">json</span>
+  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">admin</span><span class="p">:</span><span class="n">admin</span><span class="p">@</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span><span class="o">/</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span><span class="p">.</span><span class="n">json</span>
 </pre></div>
 
 
 <p>Which should display something like</p>
-<div class="codehilite"><pre><span class="p">{</span><span class="s">&quot;foo&quot;</span><span class="p">:</span><span class="s">&quot;bar&quot;</span><span class="p">,</span>
-<span class="s">&quot;jcr:created&quot;</span><span class="p">:</span><span class="s">&quot;Wed Aug 26 2009 17:06:40GMT+0200&quot;</span><span class="p">,</span>
-<span class="s">&quot;jcr:primaryType&quot;</span><span class="p">:</span><span class="s">&quot;sling:OsgiConfig&quot;</span><span class="p">,</span><span class="s">&quot;works&quot;</span><span class="p">:</span><span class="s">&quot;yes&quot;</span><span class="p">}</span>
+<div class="codehilite"><pre><span class="p">{</span>&quot;<span class="n">foo</span>&quot;<span class="p">:</span>&quot;<span class="n">bar</span>&quot;<span class="p">,</span>
+&quot;<span class="n">jcr</span><span class="p">:</span><span class="n">created</span>&quot;<span class="p">:</span>&quot;<span class="n">Wed</span> <span class="n">Aug</span> 26 2009 17<span class="p">:</span>06<span class="p">:</span>40<span class="n">GMT</span><span class="o">+</span>0200&quot;<span class="p">,</span>
+&quot;<span class="n">jcr</span><span class="p">:</span><span class="n">primaryType</span>&quot;<span class="p">:</span>&quot;<span class="n">sling</span><span class="p">:</span><span class="n">OsgiConfig</span>&quot;<span class="p">,</span>&quot;<span class="n">works</span>&quot;<span class="p">:</span>&quot;<span class="n">yes</span>&quot;<span class="p">}</span>
 </pre></div>
 
 
 <p>At this point, JCRInstall should have picked up our new config and installed it. The logs would confirm that, but we can also use the OSGi console's config status page (http://localhost:8888/system/console/config) to check it. That page should now contain:</p>
-<div class="codehilite"><pre><span class="n">PID</span><span class="o">=</span><span class="n">some</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
-  <span class="n">BundleLocation</span><span class="o">=</span><span class="n">Unbound</span>
-  <span class="n">_jcr_config_path</span><span class="o">=</span><span class="n">jcrinstall:</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="sr">/install/som</span><span class="n">e</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
-  <span class="n">foo</span><span class="o">=</span><span class="n">bars</span>
-  <span class="n">service</span><span class="o">.</span><span class="n">pid</span><span class="o">=</span><span class="n">some</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
-  <span class="n">works</span><span class="o">=</span><span class="n">yes</span>
+<div class="codehilite"><pre><span class="n">PID</span><span class="p">=</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
+  <span class="n">BundleLocation</span><span class="p">=</span><span class="n">Unbound</span>
+  <span class="n">_jcr_config_path</span><span class="p">=</span><span class="n">jcrinstall</span><span class="p">:</span><span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span><span class="o">/</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
+  <span class="n">foo</span><span class="p">=</span><span class="n">bars</span>
+  <span class="n">service</span><span class="p">.</span><span class="n">pid</span><span class="p">=</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
+  <span class="n">works</span><span class="p">=</span><span class="n">yes</span>
 </pre></div>
 
 
 <p>Indicating that the configuration has been installed.</p>
 <p>Let's try modifying the configuration parameters:</p>
 <div class="codehilite"><pre><span class="n">curl</span> <span class="o">\</span>
-  <span class="o">-</span><span class="n">F</span> <span class="n">works</span><span class="o">=</span><span class="n">updated</span> <span class="o">-</span><span class="n">F</span> <span class="n">even</span><span class="o">=</span><span class="n">more</span> <span class="o">\</span>
-  <span class="n">http:</span><span class="sr">//</span><span class="n">admin:admin</span><span class="nv">@localhost:8888</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="sr">/install/som</span><span class="n">e</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
+  <span class="o">-</span><span class="n">F</span> <span class="n">works</span><span class="p">=</span><span class="n">updated</span> <span class="o">-</span><span class="n">F</span> <span class="n">even</span><span class="p">=</span><span class="n">more</span> <span class="o">\</span>
+  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">admin</span><span class="p">:</span><span class="n">admin</span><span class="p">@</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span><span class="o">/</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
 </pre></div>
 
 
 <p>And check the changes in the console page:</p>
-<div class="codehilite"><pre><span class="n">PID</span><span class="o">=</span><span class="n">some</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
-  <span class="n">BundleLocation</span><span class="o">=</span><span class="n">Unbound</span>
-  <span class="n">_jcr_config_path</span><span class="o">=</span><span class="n">jcrinstall:</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="sr">/install/som</span><span class="n">e</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
-  <span class="n">even</span><span class="o">=</span><span class="n">more</span>
-  <span class="n">foo</span><span class="o">=</span><span class="n">bars</span>
-  <span class="n">service</span><span class="o">.</span><span class="n">pid</span><span class="o">=</span><span class="n">some</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
-  <span class="n">works</span><span class="o">=</span><span class="n">updated</span>
+<div class="codehilite"><pre><span class="n">PID</span><span class="p">=</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
+  <span class="n">BundleLocation</span><span class="p">=</span><span class="n">Unbound</span>
+  <span class="n">_jcr_config_path</span><span class="p">=</span><span class="n">jcrinstall</span><span class="p">:</span><span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span><span class="o">/</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
+  <span class="n">even</span><span class="p">=</span><span class="n">more</span>
+  <span class="n">foo</span><span class="p">=</span><span class="n">bars</span>
+  <span class="n">service</span><span class="p">.</span><span class="n">pid</span><span class="p">=</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
+  <span class="n">works</span><span class="p">=</span><span class="n">updated</span>
 </pre></div>
 
 
 <p>We can now delete the configuration node:</p>
 <div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">DELETE</span> <span class="o">\</span>
-  <span class="n">http:</span><span class="sr">//</span><span class="n">admin:admin</span><span class="nv">@localhost:8888</span><span class="sr">/apps/</span><span class="n">jcrtest</span><span class="sr">/install/som</span><span class="n">e</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">pid</span>
+  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">admin</span><span class="p">:</span><span class="n">admin</span><span class="p">@</span><span class="n">localhost</span><span class="p">:</span>8888<span class="o">/</span><span class="n">apps</span><span class="o">/</span><span class="n">jcrtest</span><span class="o">/</span><span class="n">install</span><span class="o">/</span><span class="n">some</span><span class="p">.</span><span class="n">config</span><span class="p">.</span><span class="n">pid</span>
 </pre></div>
 
 
@@ -195,7 +197,7 @@
 </ul>
 <p>Many of these tests are fairly readable, and can be used to find out in more detail how these modules work.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475911 by dklco on Thu, 25 Apr 2013 19:20:06 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.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/osgi-installer.html" target="sling_cwiki">/site/osgi-installer.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>OSGi Installer</h1>
       <h1 id="overview">Overview</h1>
@@ -114,7 +116,7 @@ If an installed bundle is managed via an
 <h2 id="configuration-handling">Configuration Handling</h2>
 <p>In general the OSGi installer installs the configuration with the highes priority. For example in combination with the JCR installer provider, a configuration from <em>/apps</em> is preferred over a configuration for the same service from <em>/libs</em>.</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



Mime
View raw message