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 [2/5] - in /websites/staging/sling/trunk/content: ./ documentation/ documentation/bundles/ documentation/development/ documentation/the-sling-engine/ documentation/tutorials-how-tos/ old-stuff/ old-stuff/scriptengineintegration/ pro...
Date Wed, 03 Jul 2013 07:40:21 GMT
Modified: websites/staging/sling/trunk/content/documentation/bundles/scheduler-service-commons-scheduler.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/scheduler-service-commons-scheduler.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/scheduler-service-commons-scheduler.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/scheduler-service-commons-scheduler.html" target="sling_cwiki">/site/scheduler-service-commons-scheduler.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Scheduler Service (commons scheduler)</h1>
       <p>The scheduler is a service for scheduling other services/jobs (it uses the open source Quartz library). The scheduler can be used in two ways, by registering the job through the scheduler API and by leveraging the whiteboard pattern that is supported by the scheduler.</p>
@@ -95,9 +97,9 @@
 <p>The following examples show you how to define and schedule a job that is registered through the scheduler api.</p>
 <h3 id="defining-the-job">Defining the job</h3>
 <p>The following code sample defines a <em>job</em> object that writes a message in the logs:</p>
-<div class="codehilite"><pre><span class="n">final</span> <span class="n">Runnable</span> <span class="n">job</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Runnable</span><span class="p">()</span> <span class="p">{</span>
+<div class="codehilite"><pre><span class="n">final</span> <span class="n">Runnable</span> <span class="n">job</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Runnable</span><span class="p">()</span> <span class="p">{</span>
     <span class="n">public</span> <span class="n">void</span> <span class="n">run</span><span class="p">()</span> <span class="p">{</span>
-        <span class="nb">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&quot;Executing the job&quot;</span><span class="p">);</span>
+        <span class="nb">log</span><span class="p">.</span><span class="n">info</span><span class="p">(</span>&quot;<span class="n">Executing</span> <span class="n">the</span> <span class="n">job</span>&quot;<span class="p">);</span>
     <span class="p">}</span>
 <span class="p">};</span>
 </pre></div>
@@ -105,8 +107,8 @@
 
 <h3 id="scheduling-with-a-cron-expression">Scheduling with a cron expression</h3>
 <p>To execute the job as defined above at 10:15am every Monday, Tuesday, Wednesday, Thursday and Friday, you can use the <em>addJob()</em> method with the following parameters:</p>
-<div class="codehilite"><pre><span class="n">String</span> <span class="n">schedulingExpression</span> <span class="o">=</span> <span class="s">&quot;0 15 10 ? * MON-FRI&quot;</span><span class="p">;</span>
-<span class="n">this</span><span class="o">.</span><span class="n">scheduler</span><span class="o">.</span><span class="n">addJob</span><span class="p">(</span><span class="s">&quot;myJob&quot;</span><span class="p">,</span> <span class="n">job</span><span class="p">,</span> <span class="n">null</span><span class="p">,</span> <span class="n">schedulingExpression</span><span class="p">,</span> <span class="n">true</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">String</span> <span class="n">schedulingExpression</span> <span class="p">=</span> &quot;0 15 10 ? <span class="o">*</span> <span class="n">MON</span><span class="o">-</span><span class="n">FRI</span>&quot;<span class="p">;</span>
+<span class="n">this</span><span class="p">.</span><span class="n">scheduler</span><span class="p">.</span><span class="n">addJob</span><span class="p">(</span>&quot;<span class="n">myJob</span>&quot;<span class="p">,</span> <span class="n">job</span><span class="p">,</span> <span class="n">null</span><span class="p">,</span> <span class="n">schedulingExpression</span><span class="p">,</span> <span class="n">true</span><span class="p">);</span>
 </pre></div>
 
 
@@ -114,101 +116,102 @@
  to define more scheduling expressions.</p>
 <h3 id="scheduling-at-periodic-times">Scheduling at periodic times</h3>
 <p>To execute the job as defined above every 3 minutes (180 seconds), you can use the <em>addPeriodicJob()</em> method with the following parameters:</p>
-<div class="codehilite"><pre><span class="n">long</span> <span class="n">period</span> <span class="o">=</span> <span class="mi">3</span><span class="o">*</span><span class="mi">60</span><span class="p">;</span> <span class="sr">//</span><span class="n">the</span> <span class="n">period</span> <span class="n">is</span> <span class="n">expressed</span> <span class="n">in</span> <span class="n">seconds</span>
-<span class="n">this</span><span class="o">.</span><span class="n">scheduler</span><span class="o">.</span><span class="n">addPeriodicJob</span><span class="p">(</span><span class="s">&quot;myJob&quot;</span><span class="p">,</span> <span class="n">job</span><span class="p">,</span> <span class="n">null</span><span class="p">,</span> <span class="n">period</span><span class="p">,</span> <span class="n">true</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">long</span> <span class="n">period</span> <span class="p">=</span> 3<span class="o">*</span>60<span class="p">;</span> <span class="o">//</span><span class="n">the</span> <span class="n">period</span> <span class="n">is</span> <span class="n">expressed</span> <span class="n">in</span> <span class="n">seconds</span>
+<span class="n">this</span><span class="p">.</span><span class="n">scheduler</span><span class="p">.</span><span class="n">addPeriodicJob</span><span class="p">(</span>&quot;<span class="n">myJob</span>&quot;<span class="p">,</span> <span class="n">job</span><span class="p">,</span> <span class="n">null</span><span class="p">,</span> <span class="n">period</span><span class="p">,</span> <span class="n">true</span><span class="p">);</span>
 </pre></div>
 
 
 <h3 id="scheduling-at-a-given-time">Scheduling at a given time</h3>
 <p>To execute the job as defined above at a specific date (on January 10th 2020), you can use the <em>fireJobAt()</em> method with the following parameters:</p>
-<div class="codehilite"><pre><span class="n">SimpleDateFormat</span> <span class="n">formatter</span> <span class="o">=</span> <span class="k">new</span> <span class="n">SimpleDateFormat</span><span class="p">(</span><span class="s">&quot;yyyy/MM/dd&quot;</span><span class="p">);</span>
-<span class="n">String</span> <span class="n">date</span> <span class="o">=</span> <span class="s">&quot;2020/01/10&quot;</span><span class="p">;</span>
-<span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">Date</span> <span class="n">fireDate</span> <span class="o">=</span> <span class="n">formatter</span><span class="o">.</span><span class="n">parse</span><span class="p">(</span><span class="n">date</span><span class="p">);</span>
-<span class="n">this</span><span class="o">.</span><span class="n">scheduler</span><span class="o">.</span><span class="n">fireJobAt</span><span class="p">(</span><span class="s">&quot;myJob&quot;</span><span class="p">,</span> <span class="n">job</span><span class="p">,</span> <span class="n">null</span><span class="p">,</span> <span class="n">fireDate</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">SimpleDateFormat</span> <span class="n">formatter</span> <span class="p">=</span> <span class="n">new</span> <span class="n">SimpleDateFormat</span><span class="p">(</span>&quot;<span class="n">yyyy</span><span class="o">/</span><span class="n">MM</span><span class="o">/</span><span class="n">dd</span>&quot;<span class="p">);</span>
+<span class="n">String</span> <span class="n">date</span> <span class="p">=</span> &quot;2020<span class="o">/</span>01<span class="o">/</span>10&quot;<span class="p">;</span>
+<span class="n">java</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">Date</span> <span class="n">fireDate</span> <span class="p">=</span> <span class="n">formatter</span><span class="p">.</span><span class="n">parse</span><span class="p">(</span><span class="n">date</span><span class="p">);</span>
+<span class="n">this</span><span class="p">.</span><span class="n">scheduler</span><span class="p">.</span><span class="n">fireJobAt</span><span class="p">(</span>&quot;<span class="n">myJob</span>&quot;<span class="p">,</span> <span class="n">job</span><span class="p">,</span> <span class="n">null</span><span class="p">,</span> <span class="n">fireDate</span><span class="p">);</span>
 </pre></div>
 
 
 <h3 id="a-service-scheduling-the-job-based-on-3-different-kinds-of-scheduling">A service scheduling the job based on 3 different kinds of scheduling</h3>
 <p>The code implementing a service that simultaneously executes the job based on 3 different kinds of scheduling can look as follows:</p>
-<div class="codehilite"><pre><span class="nb">package</span> <span class="n">sling</span><span class="o">.</span><span class="n">docu</span><span class="o">.</span><span class="n">examples</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">package</span> <span class="n">sling</span><span class="p">.</span><span class="n">docu</span><span class="p">.</span><span class="n">examples</span><span class="p">;</span>
 
-<span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">io</span><span class="o">.</span><span class="n">Serializable</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">Date</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">HashMap</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">java</span><span class="o">.</span><span class="n">util</span><span class="o">.</span><span class="n">Map</span><span class="p">;</span>
-
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">sling</span><span class="o">.</span><span class="n">commons</span><span class="o">.</span><span class="n">scheduler</span><span class="o">.</span><span class="n">Scheduler</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">osgi</span><span class="o">.</span><span class="n">service</span><span class="o">.</span><span class="n">component</span><span class="o">.</span><span class="n">ComponentContext</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">slf4j</span><span class="o">.</span><span class="n">Logger</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">slf4j</span><span class="o">.</span><span class="n">LoggerFactory</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">io</span><span class="p">.</span><span class="n">Serializable</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">Date</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">HashMap</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">java</span><span class="p">.</span><span class="n">util</span><span class="p">.</span><span class="n">Map</span><span class="p">;</span>
+
+<span class="n">import</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">commons</span><span class="p">.</span><span class="n">scheduler</span><span class="p">.</span><span class="n">Scheduler</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">service</span><span class="p">.</span><span class="n">component</span><span class="p">.</span><span class="n">ComponentContext</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">slf4j</span><span class="p">.</span><span class="n">Logger</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">slf4j</span><span class="p">.</span><span class="n">LoggerFactory</span><span class="p">;</span>
 
 <span class="o">/**</span>
  <span class="o">*</span>  <span class="n">This</span> <span class="n">service</span> <span class="n">executes</span> <span class="n">scheduled</span> <span class="n">jobs</span>
  <span class="o">*</span>  
- <span class="o">*</span>  <span class="nv">@scr</span><span class="o">.</span><span class="n">component</span> <span class="n">immediate</span><span class="o">=</span><span class="s">&quot;true&quot;</span> <span class="n">metatype</span><span class="o">=</span><span class="s">&quot;false&quot;</span>
+ <span class="o">*</span>  <span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">component</span> <span class="n">immediate</span><span class="p">=</span>&quot;<span class="n">true</span>&quot; <span class="n">metatype</span><span class="p">=</span>&quot;<span class="n">false</span>&quot;
  <span class="o">*</span>
  <span class="o">*/</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">HelloWorldScheduledService</span> <span class="p">{</span>
 
-    <span class="sr">/** Default log. */</span>
-    <span class="n">protected</span> <span class="n">final</span> <span class="n">Logger</span> <span class="nb">log</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="n">this</span><span class="o">.</span><span class="n">getClass</span><span class="p">());</span>
+    <span class="o">/**</span> <span class="n">Default</span> <span class="nb">log</span><span class="p">.</span> <span class="o">*/</span>
+    <span class="n">protected</span> <span class="n">final</span> <span class="n">Logger</span> <span class="nb">log</span> <span class="p">=</span> <span class="n">LoggerFactory</span><span class="p">.</span><span class="n">getLogger</span><span class="p">(</span><span class="n">this</span><span class="p">.</span><span class="n">getClass</span><span class="p">());</span>
 
-    <span class="o">/**</span> <span class="n">The</span> <span class="n">scheduler</span> <span class="k">for</span> <span class="n">rescheduling</span> <span class="n">jobs</span><span class="o">.</span>
-     <span class="o">*</span> <span class="nv">@scr</span><span class="o">.</span><span class="n">reference</span> <span class="o">*/</span>
+    <span class="o">/**</span> <span class="n">The</span> <span class="n">scheduler</span> <span class="k">for</span> <span class="n">rescheduling</span> <span class="n">jobs</span><span class="p">.</span>
+     <span class="o">*</span> <span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">reference</span> <span class="o">*/</span>
     <span class="n">private</span> <span class="n">Scheduler</span> <span class="n">scheduler</span><span class="p">;</span>
 
+
     <span class="n">protected</span> <span class="n">void</span> <span class="n">activate</span><span class="p">(</span><span class="n">ComponentContext</span> <span class="n">componentContext</span><span class="p">)</span> <span class="n">throws</span> <span class="n">Exception</span> <span class="p">{</span>
-        <span class="sr">//c</span><span class="n">ase</span> <span class="mi">1</span><span class="p">:</span> <span class="n">with</span> <span class="n">addJob</span><span class="p">()</span> <span class="n">method:</span> <span class="n">executes</span> <span class="n">the</span> <span class="n">job</span> <span class="n">every</span> <span class="n">minute</span>
-        <span class="n">String</span> <span class="n">schedulingExpression</span> <span class="o">=</span> <span class="s">&quot;0 * * * * ?&quot;</span><span class="p">;</span>
-        <span class="n">String</span> <span class="n">jobName1</span> <span class="o">=</span> <span class="s">&quot;case1&quot;</span><span class="p">;</span>
-        <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span> <span class="n">config1</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span><span class="p">();</span>
-        <span class="n">boolean</span> <span class="n">canRunConcurrently</span> <span class="o">=</span> <span class="n">true</span><span class="p">;</span>
-        <span class="n">final</span> <span class="n">Runnable</span> <span class="n">job1</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Runnable</span><span class="p">()</span> <span class="p">{</span>
+        <span class="o">//</span><span class="k">case</span> 1<span class="p">:</span> <span class="n">with</span> <span class="n">addJob</span><span class="p">()</span> <span class="n">method</span><span class="p">:</span> <span class="n">executes</span> <span class="n">the</span> <span class="n">job</span> <span class="n">every</span> <span class="n">minute</span>
+        <span class="n">String</span> <span class="n">schedulingExpression</span> <span class="p">=</span> &quot;0 <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> ?&quot;<span class="p">;</span>
+        <span class="n">String</span> <span class="n">jobName1</span> <span class="p">=</span> &quot;<span class="n">case1</span>&quot;<span class="p">;</span>
+        <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span> <span class="n">config1</span> <span class="p">=</span> <span class="n">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span><span class="p">();</span>
+        <span class="n">boolean</span> <span class="n">canRunConcurrently</span> <span class="p">=</span> <span class="n">true</span><span class="p">;</span>
+        <span class="n">final</span> <span class="n">Runnable</span> <span class="n">job1</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Runnable</span><span class="p">()</span> <span class="p">{</span>
             <span class="n">public</span> <span class="n">void</span> <span class="n">run</span><span class="p">()</span> <span class="p">{</span>
-                <span class="nb">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&quot;Executing job1&quot;</span><span class="p">);</span>
+                <span class="nb">log</span><span class="p">.</span><span class="n">info</span><span class="p">(</span>&quot;<span class="n">Executing</span> <span class="n">job1</span>&quot;<span class="p">);</span>
             <span class="p">}</span>
         <span class="p">};</span>
-        <span class="n">try</span> <span class="p">{</span>
-            <span class="n">this</span><span class="o">.</span><span class="n">scheduler</span><span class="o">.</span><span class="n">addJob</span><span class="p">(</span><span class="n">jobName1</span><span class="p">,</span> <span class="n">job1</span><span class="p">,</span> <span class="n">config1</span><span class="p">,</span> <span class="n">schedulingExpression</span><span class="p">,</span> <span class="n">canRunConcurrently</span><span class="p">);</span>
-        <span class="p">}</span> <span class="n">catch</span> <span class="p">(</span><span class="n">Exception</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
-            <span class="n">job1</span><span class="o">.</span><span class="n">run</span><span class="p">();</span>
+        <span class="k">try</span> <span class="p">{</span>
+            <span class="n">this</span><span class="p">.</span><span class="n">scheduler</span><span class="p">.</span><span class="n">addJob</span><span class="p">(</span><span class="n">jobName1</span><span class="p">,</span> <span class="n">job1</span><span class="p">,</span> <span class="n">config1</span><span class="p">,</span> <span class="n">schedulingExpression</span><span class="p">,</span> <span class="n">canRunConcurrently</span><span class="p">);</span>
+        <span class="p">}</span> <span class="k">catch</span> <span class="p">(</span><span class="n">Exception</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+            <span class="n">job1</span><span class="p">.</span><span class="n">run</span><span class="p">();</span>
         <span class="p">}</span>
 
-        <span class="sr">//c</span><span class="n">ase</span> <span class="mi">2</span><span class="p">:</span> <span class="n">with</span> <span class="n">addPeriodicJob</span><span class="p">():</span> <span class="n">executes</span> <span class="n">the</span> <span class="n">job</span> <span class="n">every</span> <span class="mi">3</span> <span class="n">minutes</span>
-        <span class="n">String</span> <span class="n">jobName2</span> <span class="o">=</span> <span class="s">&quot;case2&quot;</span><span class="p">;</span>
-        <span class="n">long</span> <span class="n">period</span> <span class="o">=</span> <span class="mi">180</span><span class="p">;</span>
-        <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span> <span class="n">config2</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span><span class="p">();</span>
-        <span class="n">final</span> <span class="n">Runnable</span> <span class="n">job2</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Runnable</span><span class="p">()</span> <span class="p">{</span>
+        <span class="o">//</span><span class="k">case</span> 2<span class="p">:</span> <span class="n">with</span> <span class="n">addPeriodicJob</span><span class="p">():</span> <span class="n">executes</span> <span class="n">the</span> <span class="n">job</span> <span class="n">every</span> 3 <span class="n">minutes</span>
+        <span class="n">String</span> <span class="n">jobName2</span> <span class="p">=</span> &quot;<span class="n">case2</span>&quot;<span class="p">;</span>
+        <span class="n">long</span> <span class="n">period</span> <span class="p">=</span> 180<span class="p">;</span>
+        <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span> <span class="n">config2</span> <span class="p">=</span> <span class="n">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span><span class="p">();</span>
+        <span class="n">final</span> <span class="n">Runnable</span> <span class="n">job2</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Runnable</span><span class="p">()</span> <span class="p">{</span>
             <span class="n">public</span> <span class="n">void</span> <span class="n">run</span><span class="p">()</span> <span class="p">{</span>
-                <span class="nb">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&quot;Executing job2&quot;</span><span class="p">);</span>
+                <span class="nb">log</span><span class="p">.</span><span class="n">info</span><span class="p">(</span>&quot;<span class="n">Executing</span> <span class="n">job2</span>&quot;<span class="p">);</span>
             <span class="p">}</span>
         <span class="p">};</span>
-        <span class="n">try</span> <span class="p">{</span>
-            <span class="n">this</span><span class="o">.</span><span class="n">scheduler</span><span class="o">.</span><span class="n">addPeriodicJob</span><span class="p">(</span><span class="n">jobName2</span><span class="p">,</span> <span class="n">job2</span><span class="p">,</span> <span class="n">config2</span><span class="p">,</span> <span class="n">period</span><span class="p">,</span> <span class="n">canRunConcurrently</span><span class="p">);</span>
-        <span class="p">}</span> <span class="n">catch</span> <span class="p">(</span><span class="n">Exception</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
-            <span class="n">job2</span><span class="o">.</span><span class="n">run</span><span class="p">();</span>
+        <span class="k">try</span> <span class="p">{</span>
+            <span class="n">this</span><span class="p">.</span><span class="n">scheduler</span><span class="p">.</span><span class="n">addPeriodicJob</span><span class="p">(</span><span class="n">jobName2</span><span class="p">,</span> <span class="n">job2</span><span class="p">,</span> <span class="n">config2</span><span class="p">,</span> <span class="n">period</span><span class="p">,</span> <span class="n">canRunConcurrently</span><span class="p">);</span>
+        <span class="p">}</span> <span class="k">catch</span> <span class="p">(</span><span class="n">Exception</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+            <span class="n">job2</span><span class="p">.</span><span class="n">run</span><span class="p">();</span>
         <span class="p">}</span>
 
-        <span class="sr">//c</span><span class="n">ase</span> <span class="mi">3</span><span class="p">:</span> <span class="n">with</span> <span class="n">fireJobAt</span><span class="p">():</span> <span class="n">executes</span> <span class="n">the</span> <span class="n">job</span> <span class="n">at</span> <span class="n">a</span> <span class="n">specific</span> <span class="n">date</span> <span class="p">(</span><span class="n">date</span> <span class="n">of</span> <span class="n">deployment</span> <span class="o">+</span> <span class="n">delay</span> <span class="n">of</span> <span class="mi">30</span> <span class="n">seconds</span><span class="p">)</span>
-        <span class="n">String</span> <span class="n">jobName3</span> <span class="o">=</span> <span class="s">&quot;case3&quot;</span><span class="p">;</span>
-        <span class="n">final</span> <span class="n">long</span> <span class="n">delay</span> <span class="o">=</span> <span class="mi">30</span><span class="o">*</span><span class="mi">1000</span><span class="p">;</span>
-        <span class="n">final</span> <span class="n">Date</span> <span class="n">fireDate</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Date</span><span class="p">();</span>
-        <span class="n">fireDate</span><span class="o">.</span><span class="n">setTime</span><span class="p">(</span><span class="n">System</span><span class="o">.</span><span class="n">currentTimeMillis</span><span class="p">()</span> <span class="o">+</span> <span class="n">delay</span><span class="p">);</span>
-        <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span> <span class="n">config3</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span><span class="p">();</span>
-        <span class="n">final</span> <span class="n">Runnable</span> <span class="n">job3</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Runnable</span><span class="p">()</span> <span class="p">{</span>
+        <span class="o">//</span><span class="k">case</span> 3<span class="p">:</span> <span class="n">with</span> <span class="n">fireJobAt</span><span class="p">():</span> <span class="n">executes</span> <span class="n">the</span> <span class="n">job</span> <span class="n">at</span> <span class="n">a</span> <span class="n">specific</span> <span class="n">date</span> <span class="p">(</span><span class="n">date</span> <span class="n">of</span> <span class="n">deployment</span> <span class="o">+</span> <span class="n">delay</span> <span class="n">of</span> 30 <span class="n">seconds</span><span class="p">)</span>
+        <span class="n">String</span> <span class="n">jobName3</span> <span class="p">=</span> &quot;<span class="n">case3</span>&quot;<span class="p">;</span>
+        <span class="n">final</span> <span class="n">long</span> <span class="n">delay</span> <span class="p">=</span> 30<span class="o">*</span>1000<span class="p">;</span>
+        <span class="n">final</span> <span class="n">Date</span> <span class="n">fireDate</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Date</span><span class="p">();</span>
+        <span class="n">fireDate</span><span class="p">.</span><span class="n">setTime</span><span class="p">(</span><span class="n">System</span><span class="p">.</span><span class="n">currentTimeMillis</span><span class="p">()</span> <span class="o">+</span> <span class="n">delay</span><span class="p">);</span>
+        <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span> <span class="n">config3</span> <span class="p">=</span> <span class="n">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="p">,</span> <span class="n">Serializable</span><span class="o">&gt;</span><span class="p">();</span>
+        <span class="n">final</span> <span class="n">Runnable</span> <span class="n">job3</span> <span class="p">=</span> <span class="n">new</span> <span class="n">Runnable</span><span class="p">()</span> <span class="p">{</span>
             <span class="n">public</span> <span class="n">void</span> <span class="n">run</span><span class="p">()</span> <span class="p">{</span>
-                <span class="nb">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&quot;Executing job3 at date: {} with a delay of: {} seconds&quot;</span><span class="p">,</span> <span class="n">fireDate</span><span class="p">,</span> <span class="n">delay</span><span class="o">/</span><span class="mi">1000</span><span class="p">);</span>
+                <span class="nb">log</span><span class="p">.</span><span class="n">info</span><span class="p">(</span>&quot;<span class="n">Executing</span> <span class="n">job3</span> <span class="n">at</span> <span class="n">date</span><span class="p">:</span> <span class="p">{}</span> <span class="n">with</span> <span class="n">a</span> <span class="n">delay</span> <span class="n">of</span><span class="p">:</span> <span class="p">{}</span> <span class="n">seconds</span>&quot;<span class="p">,</span> <span class="n">fireDate</span><span class="p">,</span> <span class="n">delay</span><span class="o">/</span>1000<span class="p">);</span>
             <span class="p">}</span>
         <span class="p">};</span>
-        <span class="n">try</span> <span class="p">{</span>
-            <span class="n">this</span><span class="o">.</span><span class="n">scheduler</span><span class="o">.</span><span class="n">fireJobAt</span><span class="p">(</span><span class="n">jobName3</span><span class="p">,</span> <span class="n">job3</span><span class="p">,</span> <span class="n">config3</span><span class="p">,</span> <span class="n">fireDate</span><span class="p">);</span>
-        <span class="p">}</span> <span class="n">catch</span> <span class="p">(</span><span class="n">Exception</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
-            <span class="n">job3</span><span class="o">.</span><span class="n">run</span><span class="p">();</span>
+        <span class="k">try</span> <span class="p">{</span>
+            <span class="n">this</span><span class="p">.</span><span class="n">scheduler</span><span class="p">.</span><span class="n">fireJobAt</span><span class="p">(</span><span class="n">jobName3</span><span class="p">,</span> <span class="n">job3</span><span class="p">,</span> <span class="n">config3</span><span class="p">,</span> <span class="n">fireDate</span><span class="p">);</span>
+        <span class="p">}</span> <span class="k">catch</span> <span class="p">(</span><span class="n">Exception</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+            <span class="n">job3</span><span class="p">.</span><span class="n">run</span><span class="p">();</span>
         <span class="p">}</span>
     <span class="p">}</span>
 
     <span class="n">protected</span> <span class="n">void</span> <span class="n">deactivate</span><span class="p">(</span><span class="n">ComponentContext</span> <span class="n">componentContext</span><span class="p">)</span> <span class="p">{</span>
-        <span class="nb">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&quot;Deactivated, goodbye!&quot;</span><span class="p">);</span>
+        <span class="nb">log</span><span class="p">.</span><span class="n">info</span><span class="p">(</span>&quot;<span class="n">Deactivated</span><span class="p">,</span> <span class="n">goodbye</span>!&quot;<span class="p">);</span>
     <span class="p">}</span>
 
 <span class="p">}</span>
@@ -219,60 +222,60 @@
 <p>The following examples show you how to define and schedule a job by leveraging the whiteboard pattern.</p>
 <h3 id="scheduling-with-a-cron-expression_1">Scheduling with a cron expression</h3>
 <p>The following job is executed every minute by setting <em>scheduler.expression</em> to the cron expression <em>"0 * </em> * <em> ?"</em>:</p>
-<div class="codehilite"><pre><span class="nb">package</span> <span class="n">sling</span><span class="o">.</span><span class="n">docu</span><span class="o">.</span><span class="n">examples</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">package</span> <span class="n">sling</span><span class="p">.</span><span class="n">docu</span><span class="p">.</span><span class="n">examples</span><span class="p">;</span>
 
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">slf4j</span><span class="o">.</span><span class="n">Logger</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">slf4j</span><span class="o">.</span><span class="n">LoggerFactory</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">slf4j</span><span class="p">.</span><span class="n">Logger</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">slf4j</span><span class="p">.</span><span class="n">LoggerFactory</span><span class="p">;</span>
 
 <span class="o">/**</span>
- <span class="o">*</span> <span class="nv">@scr</span><span class="o">.</span><span class="n">component</span>
- <span class="o">*</span> <span class="nv">@scr</span><span class="o">.</span><span class="n">service</span> <span class="n">interface</span><span class="o">=</span><span class="s">&quot;java.lang.Runnable&quot;</span>
- <span class="o">*</span> <span class="nv">@scr</span><span class="o">.</span><span class="n">property</span> <span class="n">name</span><span class="o">=</span><span class="s">&quot;scheduler.expression&quot;</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;0 * * * * ?&quot;</span>
+ <span class="o">*</span> <span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">component</span>
+ <span class="o">*</span> <span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">service</span> <span class="n">interface</span><span class="p">=</span>&quot;<span class="n">java</span><span class="p">.</span><span class="n">lang</span><span class="p">.</span><span class="n">Runnable</span>&quot;
+ <span class="o">*</span> <span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">property</span> <span class="n">name</span><span class="p">=</span>&quot;<span class="n">scheduler</span><span class="p">.</span><span class="n">expression</span>&quot; <span class="n">value</span><span class="p">=</span>&quot;0 <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> ?&quot;
  <span class="o">*/</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">ScheduledCronJob</span> <span class="n">implements</span> <span class="n">Runnable</span> <span class="p">{</span>
 
-    <span class="sr">/** Default log. */</span>
-    <span class="n">protected</span> <span class="n">final</span> <span class="n">Logger</span> <span class="nb">log</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="n">this</span><span class="o">.</span><span class="n">getClass</span><span class="p">());</span>
+    <span class="o">/**</span> <span class="n">Default</span> <span class="nb">log</span><span class="p">.</span> <span class="o">*/</span>
+    <span class="n">protected</span> <span class="n">final</span> <span class="n">Logger</span> <span class="nb">log</span> <span class="p">=</span> <span class="n">LoggerFactory</span><span class="p">.</span><span class="n">getLogger</span><span class="p">(</span><span class="n">this</span><span class="p">.</span><span class="n">getClass</span><span class="p">());</span>
 
     <span class="n">public</span> <span class="n">void</span> <span class="n">run</span><span class="p">()</span> <span class="p">{</span>
-        <span class="nb">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&quot;Executing a cron job (job#1) through the whiteboard pattern&quot;</span><span class="p">);</span>
+        <span class="nb">log</span><span class="p">.</span><span class="n">info</span><span class="p">(</span>&quot;<span class="n">Executing</span> <span class="n">a</span> <span class="n">cron</span> <span class="n">job</span> <span class="p">(</span><span class="n">job</span>#1<span class="p">)</span> <span class="n">through</span> <span class="n">the</span> <span class="n">whiteboard</span> <span class="n">pattern</span>&quot;<span class="p">);</span>
     <span class="p">}</span>
-<span class="sr">//</span>
+<span class="o">//</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <h3 id="scheduling-at-periodic-times_1">Scheduling at periodic times</h3>
 <p>The following job is executed every ten seconds by setting <em>scheduler.period</em> to <em>10</em>:</p>
-<div class="codehilite"><pre><span class="nb">package</span> <span class="n">sling</span><span class="o">.</span><span class="n">docu</span><span class="o">.</span><span class="n">examples</span><span class="p">;</span>
+<div class="codehilite"><pre><span class="n">package</span> <span class="n">sling</span><span class="p">.</span><span class="n">docu</span><span class="p">.</span><span class="n">examples</span><span class="p">;</span>
 
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">slf4j</span><span class="o">.</span><span class="n">Logger</span><span class="p">;</span>
-<span class="nb">import</span> <span class="n">org</span><span class="o">.</span><span class="n">slf4j</span><span class="o">.</span><span class="n">LoggerFactory</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">slf4j</span><span class="p">.</span><span class="n">Logger</span><span class="p">;</span>
+<span class="n">import</span> <span class="n">org</span><span class="p">.</span><span class="n">slf4j</span><span class="p">.</span><span class="n">LoggerFactory</span><span class="p">;</span>
 
 <span class="o">/**</span>
- <span class="o">*</span> <span class="nv">@scr</span><span class="o">.</span><span class="n">component</span>
- <span class="o">*</span> <span class="nv">@scr</span><span class="o">.</span><span class="n">service</span> <span class="n">interface</span><span class="o">=</span><span class="s">&quot;java.lang.Runnable&quot;</span>
- <span class="o">*</span> <span class="nv">@scr</span><span class="o">.</span><span class="n">property</span> <span class="n">name</span><span class="o">=</span><span class="s">&quot;scheduler.period&quot;</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;10&quot;</span> <span class="n">type</span><span class="o">=</span><span class="s">&quot;Long&quot;</span>
+ <span class="o">*</span> <span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">component</span>
+ <span class="o">*</span> <span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">service</span> <span class="n">interface</span><span class="p">=</span>&quot;<span class="n">java</span><span class="p">.</span><span class="n">lang</span><span class="p">.</span><span class="n">Runnable</span>&quot;
+ <span class="o">*</span> <span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">property</span> <span class="n">name</span><span class="p">=</span>&quot;<span class="n">scheduler</span><span class="p">.</span><span class="n">period</span>&quot; <span class="n">value</span><span class="p">=</span>&quot;10&quot; <span class="n">type</span><span class="p">=</span>&quot;<span class="n">Long</span>&quot;
  <span class="o">*/</span>
 <span class="n">public</span> <span class="n">class</span> <span class="n">ScheduledPeriodicJob</span> <span class="n">implements</span> <span class="n">Runnable</span> <span class="p">{</span>
 
-    <span class="sr">/** Default log. */</span>
-    <span class="n">protected</span> <span class="n">final</span> <span class="n">Logger</span> <span class="nb">log</span> <span class="o">=</span> <span class="n">LoggerFactory</span><span class="o">.</span><span class="n">getLogger</span><span class="p">(</span><span class="n">this</span><span class="o">.</span><span class="n">getClass</span><span class="p">());</span>
+    <span class="o">/**</span> <span class="n">Default</span> <span class="nb">log</span><span class="p">.</span> <span class="o">*/</span>
+    <span class="n">protected</span> <span class="n">final</span> <span class="n">Logger</span> <span class="nb">log</span> <span class="p">=</span> <span class="n">LoggerFactory</span><span class="p">.</span><span class="n">getLogger</span><span class="p">(</span><span class="n">this</span><span class="p">.</span><span class="n">getClass</span><span class="p">());</span>
 
     <span class="n">public</span> <span class="n">void</span> <span class="n">run</span><span class="p">()</span> <span class="p">{</span>
-        <span class="nb">log</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s">&quot;Executing a perodic job (job#2) through the whiteboard pattern&quot;</span><span class="p">);</span>
+        <span class="nb">log</span><span class="p">.</span><span class="n">info</span><span class="p">(</span>&quot;<span class="n">Executing</span> <span class="n">a</span> <span class="n">perodic</span> <span class="n">job</span> <span class="p">(</span><span class="n">job</span>#2<span class="p">)</span> <span class="n">through</span> <span class="n">the</span> <span class="n">whiteboard</span> <span class="n">pattern</span>&quot;<span class="p">);</span>
     <span class="p">}</span>
-<span class="sr">//</span>
+<span class="o">//</span>
 <span class="p">}</span>
 </pre></div>
 
 
 <h3 id="preventing-concurrent-execution">Preventing concurrent execution</h3>
 <p>By default, jobs can be concurrently executed. To prevent this, set the <em>scheduler.concurrent</em> property to <em>false</em>:</p>
-<div class="codehilite"><pre><span class="nv">@scr</span><span class="o">.</span><span class="n">property</span> <span class="n">name</span><span class="o">=</span><span class="s">&quot;scheduler.concurrent&quot;</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;false&quot;</span> <span class="n">type</span><span class="o">=</span><span class="s">&quot;Boolean&quot;</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">property</span> <span class="n">name</span><span class="p">=</span>&quot;<span class="n">scheduler</span><span class="p">.</span><span class="n">concurrent</span>&quot; <span class="n">value</span><span class="p">=</span>&quot;<span class="n">false</span>&quot; <span class="n">type</span><span class="p">=</span>&quot;<span class="n">Boolean</span>&quot;
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475804 by dklco on Thu, 25 Apr 2013 14:45:50 +0000
+        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/bundles/web-console-extensions.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/web-console-extensions.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/web-console-extensions.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/web-console-extensions.html" target="sling_cwiki">/site/web-console-extensions.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Web Console Extensions</h1>
       <p>The Apache Sling project provides two extensions to the <a href="http://felix.apache.org/site/apache-felix-web-console.html">Apache Felix Web Console</a> (in addition to a number of plugins, of course):</p>
@@ -134,7 +136,7 @@
 </table>
 <p>Note, that while the default value explicitly grants the <em>admin</em> user to access the Web Console it is suggested that system administrators define a special group and assign users with Web Console access to this group.</p>
       <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/configuration.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/configuration.html (original)
+++ websites/staging/sling/trunk/content/documentation/configuration.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/configuration.html" target="sling_cwiki">/site/configuration.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Configuration</h1>
       <h2 id="introduction">Introduction</h2>
@@ -274,7 +276,7 @@
 <p>By default the Configuration Admin Service is installed when Sling is started for the first time. This service is used by the Service Component Runtime launching the OSGi components declared in the bundles with configuration values. The Sling Management Console provides a simple GUI to manage these configuration elements on the 'Configuration' page.</p>
 <p>For more information on the Configuration Admin Service refer to the OSGi Configuration Admin Service Specification in the OSGi Service Platform Service Compendium book.</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/development/client-request-logging.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/client-request-logging.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/client-request-logging.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/client-request-logging.html" target="sling_cwiki">/site/client-request-logging.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Client Request Logging</h1>
       <p>Sling provides extensive support to log various information at the before and after processing client requests. Out of the box, there are two loggers configured to write traditional <code>access.log</code> and <code>request.log</code> files. In addition more logging can be configured by providing OSGi Configuration Admin configuration.</p>
@@ -374,12 +376,11 @@
   <strong> Allow message at INFO (Information) level to be logged which is the level used by the request loggers
   </strong> Define the appropriate log file name, for example <code>logs/client.request.log</code>
   <strong> Use only <code>\{5</code>} as the message format because request logger messages are generally already fully formated with required timestamp etc.
-<br />
-</strong> Add any Logger names used for the client request log configuration, <code>clientlog.request</code> in the example above, to the Logger field. By clicking on the <code>+</code> (plus) button you may add more than a single logger name whose messages are written to this file.</li>
+  </strong> Add any Logger names used for the client request log configuration, <code>clientlog.request</code> in the example above, to the Logger field. By clicking on the <code>+</code> (plus) button you may add more than a single logger name whose messages are written to this file.</li>
 <li>Optionally, you may create an <em>Apache Sling Logging Writer Configuration</em> for the log file defined in the previous step to better control rotation setup. See <a href="">Log Writer Configuration</a> for full details.</li>
 </ol>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1476698 by dklco on Sun, 28 Apr 2013 00:02:11 +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/development/dependency-management.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/dependency-management.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/dependency-management.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/dependency-management.html" target="sling_cwiki">/site/dependency-management.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Dependency Management</h1>
       <p>This page is about how we do and don't do dependency management in the Sling project.</p>
@@ -182,7 +184,7 @@
 <li><a href="https://issues.apache.org/jira/browse/SLING-811">SLING-811</a> -- The actual issue governing the changes to the project descriptors</li>
 </ul>
       <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/development/embedding-sling.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/embedding-sling.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/embedding-sling.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/embedding-sling.html" target="sling_cwiki">/site/embedding-sling.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Embedding Sling</h1>
       <p>The Sling Launchpad Launcher can be used to embed the OSGi Framework startup in your own Java application. This functionality is implemented in the <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/base">Sling Launchpad Base project</a>. This project has the following features:</p>
@@ -325,7 +327,7 @@ This work is being done as part of [SLIN
 </table>
 <p>At the moment these classes, particularly the <code>SlingServlet</code> class, are not particularly well suited to be extended by a servlet slightly modifying the launcher.</p>
       <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/development/getting-and-building-sling.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/getting-and-building-sling.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/getting-and-building-sling.html Wed Jul  3 07:40:20 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -86,6 +83,11 @@
       </div>
 
       
+      <div class="tip">
+           This page is a translated version of <a href="/site/getting-and-building-sling.html" target="sling_cwiki">/site/getting-and-building-sling.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Getting and Building Sling</h1>
       <p>A quick guide for getting the Sling source, then building and running the resulting Sling instance; either without or with Eclipse.</p>
@@ -117,12 +119,12 @@
 <li><em>Fix</em> - Increase the values of the maximum heap and perm space for the build by setting or extending the <code>MAVEN_OPTS</code> environment variable.</li>
 </ul>
 <p>For 32bit platforms you should use</p>
-<div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="o">=</span><span class="s">&quot;-Xmx256M -XX:MaxPermSize=256m&quot;</span>
+<div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="p">=</span>&quot;<span class="o">-</span><span class="n">Xmx256M</span> <span class="o">-</span><span class="n">XX</span><span class="p">:</span><span class="n">MaxPermSize</span><span class="p">=</span>256<span class="n">m</span>&quot;
 </pre></div>
 
 
 <p>For 64bit platforms, you should use</p>
-<div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="o">=</span><span class="s">&quot;-Xmx512M -XX:MaxPermSize=512m&quot;</span>
+<div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="p">=</span>&quot;<span class="o">-</span><span class="n">Xmx512M</span> <span class="o">-</span><span class="n">XX</span><span class="p">:</span><span class="n">MaxPermSize</span><span class="p">=</span>512<span class="n">m</span>&quot;
 </pre></div>
 
 
@@ -259,7 +261,7 @@ When starting Sling inside the `launchpa
 <p>Now you should be able to set breakpoints, evaluate properties, and so on as usual.</p>
 <h3 id="debug-maven-tests-in-eclipse">Debug Maven Tests in Eclipse</h3>
 <p>In the same way as you can debug the sling app, you are also able to debug a maven test. Just run the maven tests like this</p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="o">-</span><span class="n">Dmaven</span><span class="o">.</span><span class="n">surefire</span><span class="o">.</span><span class="n">debug</span> <span class="n">test</span>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="o">-</span><span class="n">Dmaven</span><span class="p">.</span><span class="n">surefire</span><span class="p">.</span><span class="n">debug</span> <span class="n">test</span>
 </pre></div>
 
 
@@ -277,7 +279,7 @@ For more information on this see the <a 
 </ul>
 <p>If adding dependencies to the poms, run mvn eclipse:eclipse again and refresh the project in Eclipse. Debugging works as described above.</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/development/issue-tracker.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/issue-tracker.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/issue-tracker.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/issue-tracker.html" target="sling_cwiki">/site/issue-tracker.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Issue Tracker</h1>
       <p>Apache Sling uses Jira for tracking bug reports and requests for improvements, new features, and other changes.</p>
@@ -210,7 +212,7 @@
 <h2 id="patches">Patches</h2>
 <p>When reporting a bug, requesting a feature or propose an improvement, it is a good thing to attach a patch to the issue. This may speed up issue processing and helps you being recognized as a good community member leading to closer involvement with Sling.</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/development/jspc.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/jspc.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/jspc.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/jspc.html" target="sling_cwiki">/site/jspc.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Maven JspC Plugin</h1>
       <p>The Maven JspC Plugin provides a single goal <code>jspc</code> which is by default executed in the <code>compile</code> phase of the Maven build process. This goal takes all JSP source files from a configured location (<code>src/main/scripts</code> by default) and compiles them into classes in a configurable location (<code>target/jspc-plugin-generated</code> by default). In addition, for each compiled JSP a Declarative Services descriptor is generated and written to a descriptor file (<code>OSGI-INF/jspServiceComponents.xml</code> in the output location). This descriptor will then be read by the Service Component Runtime of the deployment OSGi framework to register all contained JSP as <code>javax.servlet.Servlet</code> services.</p>
@@ -160,7 +162,7 @@
 <h2 id="notes">Notes</h2>
 <p>The generated JSP classes as well as the Declarative Services descriptor are automatically copied to the generated bundle jar file if the Maven Bundle Plugin (from the Apache Felix) project is used to build the project package.</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/development/logging.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/logging.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/logging.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/logging.html" target="sling_cwiki">/site/logging.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Logging</h1>
       <h2 id="introduction">Introduction</h2>
@@ -270,7 +272,7 @@
 <p>Log file rotation by size is specified by setting the <code>org.apache.sling.commons.log.file.size</code> property to a plain number or a number plus a size multiplier. The size multiplier may be any of <code>K</code>, <code>KB</code>, <code>M</code>, <code>MB</code>, <code>G</code>, or <code>GB</code> where the case is ignored and the meaning is probably obvious.</p>
 <p>When using Size Rotation, the <code>org.apache.sling.commons.log.file.number</code> defines the number of old log file generations to keep. For example to keep 5 old log files indexed by 0 through 4, set the <code>org.apache.sling.commons.log.file.number</code> to <code>5</code> (which happens to be the default).</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1475909 by dklco on Thu, 25 Apr 2013 19:17:05 +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/development/maven-archetypes.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/maven-archetypes.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/maven-archetypes.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/maven-archetypes.html" target="sling_cwiki">/site/maven-archetypes.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Maven Archetypes</h1>
       <p>Sling includes four Maven archetypes to quick start development. See <a href="http://maven.apache.org/archetype/maven-archetype-plugin/">http://maven.apache.org/archetype/maven-archetype-plugin/</a> for general information on using Maven archetypes. The Maven groupId for all Sling archetypes is <code>org.apache.sling</code>.</p>
@@ -102,7 +104,7 @@
 <h3 id="sling-jcrinstall-bundle-archetype">sling-jcrinstall-bundle-archetype</h3>
 <p>This archetype generates a Maven project which will build a basic OSGi bundle including support for the Felix SCR Annotations. It is pre-configured to install using a WebDAV PUT into the JCR when the profile <code>autoInstallBundle</code> is activated.</p>
       <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/development/maven-launchpad-plugin.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/maven-launchpad-plugin.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/maven-launchpad-plugin.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/maven-launchpad-plugin.html" target="sling_cwiki">/site/maven-launchpad-plugin.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>Maven Launchpad Plugin</h1>
       <p>The Maven Launchpad Plugin provides goals which facilitate the creation of OSGi applications. It supports the following runtime scenarios:</p>
@@ -257,7 +259,7 @@
 <li><code>mavenProject</code> - an instance of <code>org.apache.maven.project.MavenProject</code>.</li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1476779 by rombert on Sun, 28 Apr 2013 14:15:02 +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/development/maventipsandtricks.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/maventipsandtricks.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/maventipsandtricks.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/maventipsandtricks.html" target="sling_cwiki">/site/maventipsandtricks.html</a>. In case of
+           doubt you might want to refer to the old page.
+      </div>
+      
       
       <h1>MavenTipsAndTricks</h1>
       <p>Here's our collection of tips and tricks for building Sling with <a href="http://maven.apache.org">Maven</a>.</p>
@@ -98,7 +100,7 @@
 <h2 id="ignore-your-local-settings">Ignore your local settings</h2>
 <p>To make sure you're getting the same results as we are when building Sling, it is recommend to ignore any local settings.</p>
 <p>On unixish platforms, using</p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="o">-</span><span class="n">s</span> <span class="sr">/dev/</span><span class="n">null</span> <span class="o">...</span>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="o">-</span><span class="n">s</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="p">...</span>
 </pre></div>
 
 
@@ -113,14 +115,14 @@ Does anyone have a similar command-line 
 <p>Set it according to your platform, i.e. <code>export MAVEN*OPTS=...</code> on unixish systems or <code>set MAVEN*OPTS=...</code> on Windows.</p>
 <h2 id="increase-jvm-memory-if-needed">Increase JVM memory if needed</h2>
 <p>If getting an OutOfMemoryException when running mvn, try setting</p>
-<div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="o">=</span><span class="s">&quot;-Xmx256M -XX:MaxPermSize=256m&quot;</span>
+<div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="p">=</span>&quot;<span class="o">-</span><span class="n">Xmx256M</span> <span class="o">-</span><span class="n">XX</span><span class="p">:</span><span class="n">MaxPermSize</span><span class="p">=</span>256<span class="n">m</span>&quot;
 </pre></div>
 
 
 <p>to allocate 256MB of RAM to Maven.</p>
 <h2 id="debugging-code-launched-by-maven">Debugging code launched by Maven</h2>
 <p>To run the Sling launchpad webapp in debug mode from Maven, for example, use something like</p>
-<div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="o">=</span><span class="s">&quot;-agentlib:jdwp=transport=dt_socket,address=30303,server=y,suspend=n&quot;</span>
+<div class="codehilite"><pre><span class="n">MAVEN_OPTS</span><span class="p">=</span>&quot;<span class="o">-</span><span class="n">agentlib</span><span class="p">:</span><span class="n">jdwp</span><span class="p">=</span><span class="n">transport</span><span class="p">=</span><span class="n">dt_socket</span><span class="p">,</span><span class="n">address</span><span class="p">=</span>30303<span class="p">,</span><span class="n">server</span><span class="p">=</span><span class="n">y</span><span class="p">,</span><span class="n">suspend</span><span class="p">=</span><span class="n">n</span>&quot;
 </pre></div>
 
 
@@ -128,7 +130,7 @@ Does anyone have a similar command-line 
 <h2 id="avoid-spaces-in-maven-repository-and-workspace-paths">Avoid spaces in Maven repository and workspace paths</h2>
 <p>Some Maven plugins do not like spaces in paths. It is better to avoid putting your Maven repository, or your code, under paths like <em>Documents and Settings</em>, for example.</p>
       <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



Mime
View raw message