incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r868731 [2/6] - in /websites/staging/sling/trunk/content: ./ documentation/ documentation/bundles/ documentation/development/ documentation/getting-started/ documentation/the-sling-engine/ documentation/the-sling-engine/authentication/ docu...
Date Sun, 07 Jul 2013 18:50:12 GMT
Modified: websites/staging/sling/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -95,7 +92,7 @@
 <li><a href="#preface-multipartform-data-posts">Preface: multipart/form-data POSTs</a></li>
 <li><a href="#slingpostservlet-operations">SlingPostServlet Operations</a><ul>
 <li><a href="#content-creation-or-modification">Content Creation or Modification</a><ul>
-<li><a href="#setting-property-values">Setting Property Values</a><ul>
+<li><a href="#setting-property-values">Setting Property Values</a></li>
 <li><a href="#file-uploads">File Uploads</a></li>
 <li><a href="#date-properties">Date properties</a></li>
 <li><a href="#omitting-some-parameters">Omitting Some Parameters</a></li>
@@ -114,38 +111,30 @@
 <li><a href="#response-status">Response Status</a></li>
 </ul>
 </li>
-</ul>
-</li>
 <li><a href="#content-removal">Content Removal</a><ul>
-<li><a href="#response-status_1">Response Status</a><ul>
+<li><a href="#response-status_1">Response Status</a></li>
 <li><a href="#deleting-multiple-items">Deleting Multiple Items</a><ul>
 <li><a href="#response-status_2">Response Status</a></li>
 </ul>
 </li>
 </ul>
 </li>
-</ul>
-</li>
 <li><a href="#copying-content">Copying Content</a><ul>
-<li><a href="#response-status_3">Response Status</a><ul>
+<li><a href="#response-status_3">Response Status</a></li>
 <li><a href="#copying-multiple-items">Copying Multiple Items</a><ul>
 <li><a href="#response-status_4">Response Status</a></li>
 </ul>
 </li>
 </ul>
 </li>
-</ul>
-</li>
 <li><a href="#moving-content">Moving Content</a><ul>
-<li><a href="#response-status_5">Response Status</a><ul>
+<li><a href="#response-status_5">Response Status</a></li>
 <li><a href="#moving-multiple-items">Moving Multiple Items</a><ul>
 <li><a href="#response-status_6">Response Status</a></li>
 </ul>
 </li>
 </ul>
 </li>
-</ul>
-</li>
 <li><a href="#importing-content-structures">Importing Content Structures</a><ul>
 <li><a href="#response-status_7">Response Status</a></li>
 </ul>
@@ -185,19 +174,19 @@
 
 <p>This simple form will set the <code>title</code> and <code>text</code> properties on a node at <code>/some/new/content</code>. If this node does not exist it is just created otherwise the existing content would be modified.</p>
 <p>Similarly you can do this using the <code>curl</code> command line tool:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">Ftitle</span><span class="o">=</span><span class="s">&quot;some title text&quot;</span> <span class="o">-</span><span class="n">Ftext</span><span class="o">=</span><span class="s">&quot;some body text content&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/some/</span><span class="k">new</span><span class="o">/</span><span class="n">content</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">Ftitle</span><span class="p">=</span>&quot;<span class="n">some</span> <span class="n">title</span> <span class="n">text</span>&quot; <span class="o">-</span><span class="n">Ftext</span><span class="p">=</span>&quot;<span class="n">some</span> <span class="n">body</span> <span class="n">text</span> <span class="n">content</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">some</span><span class="o">/</span><span class="n">new</span><span class="o">/</span><span class="n">content</span>
 </pre></div>
 
 
 <p>You might want to use a specific JCR node type for a newly created node. This is possibly by simply setting a <code>jcr:primaryType</code> property on the request, e.g.</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;jcr:primaryType=nt:unstructured&quot;</span> <span class="o">-</span><span class="n">Ftitle</span><span class="o">=</span><span class="s">&quot;some title text&quot;</span> <span class="o">\</span>    
-    <span class="o">-</span><span class="n">Ftext</span><span class="o">=</span><span class="s">&quot;some body text content&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/some/</span><span class="k">new</span><span class="o">/</span><span class="n">content</span>
+<div class="codehilite"><pre>$ <span class="n">curl</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">nt</span><span class="p">:</span><span class="n">unstructured</span>&quot; <span class="o">-</span><span class="n">Ftitle</span><span class="p">=</span>&quot;<span class="n">some</span> <span class="n">title</span> <span class="n">text</span>&quot; <span class="o">\</span>    
+    <span class="o">-</span><span class="n">Ftext</span><span class="p">=</span>&quot;<span class="n">some</span> <span class="n">body</span> <span class="n">text</span> <span class="n">content</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">some</span><span class="o">/</span><span class="n">new</span><span class="o">/</span><span class="n">content</span>
 </pre></div>
 
 
 <p>Similary you may assing JCR mixin node types using the <code>jcr:mixinTypes</code> property and a Sling resource type using the <code>sling:resourceType</code> property. For example:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;sling:resourceType=sling:sample&quot;</span> <span class="o">-</span><span class="n">Ftitle</span><span class="o">=</span><span class="s">&quot;some title text&quot;</span> <span class="o">\</span>    
-    <span class="o">-</span><span class="n">Ftext</span><span class="o">=</span><span class="s">&quot;some body text content&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/some/</span><span class="k">new</span><span class="o">/</span><span class="n">content</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="n">sling</span><span class="p">:</span><span class="n">resourceType</span><span class="p">=</span><span class="n">sling</span><span class="p">:</span><span class="n">sample</span>&quot; <span class="o">-</span><span class="n">Ftitle</span><span class="p">=</span>&quot;<span class="n">some</span> <span class="n">title</span> <span class="n">text</span>&quot; <span class="o">\</span>    
+    <span class="o">-</span><span class="n">Ftext</span><span class="p">=</span>&quot;<span class="n">some</span> <span class="n">body</span> <span class="n">text</span> <span class="n">content</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">some</span><span class="o">/</span><span class="n">new</span><span class="o">/</span><span class="n">content</span>
 </pre></div>
 
 
@@ -289,7 +278,7 @@ of a resource without having to specify 
 
 <p>If this form is submitted with <em>title</em> and <em>This is some Text</em> as values for the <code>title</code> and <code>text</code> fields, resp., a new node is created at the path <code>/content/page/first</code> and the <code>title</code> and <code>text</code> properties set to the respective field values. If a node at <code>/content/page/first</code> already existed before submitting the form, the <code>title</code> and <code>text</code> properties are just updated to the new values from the form fields.</p>
 <p>If a parameter has multiple values, the respective property will be created as a multi-value property. So for example the command line:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">Fmulti</span><span class="o">=</span><span class="n">one</span> <span class="o">-</span><span class="n">Fmulti</span><span class="o">=</span><span class="n">two</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/</span><span class="n">page</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">Fmulti</span><span class="p">=</span><span class="n">one</span> <span class="o">-</span><span class="n">Fmulti</span><span class="p">=</span><span class="n">two</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">page</span>
 </pre></div>
 
 
@@ -433,7 +422,7 @@ of a resource without having to specify 
 <p>will result in the single-value String property being set to an empty string.</p>
 <p>To overcome this situation the <code>@IgnoreBlanks</code> suffix may be used to consider parameters with an empty string value to be ignored during processing. That is such parameter values would be treated as if they would not be supplied.</p>
 <p>Adding</p>
-<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">input</span> <span class="n">type</span><span class="o">=</span><span class="s">&quot;hidden&quot;</span> <span class="n">name</span><span class="o">=</span><span class="s">&quot;stringProperty@IgnoreBlanks&quot;</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;true&quot;</span><span class="o">/&gt;</span>
+<div class="codehilite"><pre><span class="o">&lt;</span><span class="n">input</span> <span class="n">type</span><span class="p">=</span>&quot;<span class="n">hidden</span>&quot; <span class="n">name</span><span class="p">=</span>&quot;<span class="n">stringProperty</span><span class="p">@</span><span class="n">IgnoreBlanks</span>&quot; <span class="n">value</span><span class="p">=</span>&quot;<span class="n">true</span>&quot;<span class="o">/&gt;</span>
 </pre></div>
 
 
@@ -546,7 +535,7 @@ of a resource without having to specify 
 </table>
 <h3 id="content-removal">Content Removal</h3>
 <p>To remove existing content just address the item to be removed and set the <code>:operation</code> parameter to <code>delete</code>. For example the following command line removes the <code>/content/sample</code> page:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=delete&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/s</span><span class="n">ample</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">delete</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">sample</span>
 </pre></div>
 
 
@@ -578,13 +567,13 @@ of a resource without having to specify 
 <p>By using the <code>:applyTo</code> request parameter it is possible to remove multiple items in one single request. Deleting items in this way leaves you with less control, though. In addition, if a single item removal fails, no item at all is removed.</p>
 <p>When specifying the item(s) to be removed with the <code>:applyTo</code> parameter, the request resource is left untouched (unless of course if listed in the <code>:applyTo</code> parameter) and only used to resolve any relative paths in the <code>:applyTo</code> parameter.</p>
 <p>To remove the <code>/content/page1</code> and <code>/content/page2</code> nodes, for example, you might use the following command line:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=delete&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/page1&quot;</span> <span class="o">\</span>    
-    <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/page2&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/s</span><span class="n">ample</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">delete</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">page1</span>&quot; <span class="o">\</span>    
+    <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">page2</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">sample</span>
 </pre></div>
 
 
 <p>Using a trailing star in the :applyTo parameter (as mentioned before), you can remove all the children of the <code>/content</code> node, for example, as follows:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=delete&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/*&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/s</span><span class="n">ample</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">delete</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/*</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">sample</span>
 </pre></div>
 
 
@@ -675,15 +664,15 @@ of a resource without having to specify 
 <p>By using the <code>:applyTo</code> request parameter it is possible to copy multiple items in one single request. Copying items in this way leaves you with less control, though. In addition, if a single item copy fails, no item at all is copied.</p>
 <p>When specifying the item(s) to be copied with the <code>:applyTo</code> parameter, the request resource is left untouched (unless of course if listed in the <code>:applyTo</code> parameter) and only used to resolve any relative paths in the <code>:applyTo</code> parameter.</p>
 <p>To copy the <code>/content/page1</code> and <code>/content/page2</code> nodes to <code>/content/target</code>, for example, use:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=copy&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/page1&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/page2&quot;</span> <span class="o">\</span>    
-    <span class="o">-</span><span class="n">F</span><span class="s">&quot;:dest=/content/target/&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/s</span><span class="n">ample</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">copy</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">page1</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">page2</span>&quot; <span class="o">\</span>    
+    <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">dest</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">target</span><span class="o">/</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">sample</span>
 </pre></div>
 
 
 <p>Please note the trailing slash character (<code>/</code>) in the value of the <code>:dest</code> parameter. This is required for multi-item copy operations using the <code>:applyTo</code> parameter. The copied items are created below the node indicated by the <code>:dest</code>.</p>
 <p>Using a trailing star in the :applyTo parameter (as mentioned before), you can copy all the children of the <code>/content</code> node, for example, as follows:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=copy&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/*&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:dest=/content/target/&quot;</span> <span class="o">\</span>    
-    <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/s</span><span class="n">ample</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">copy</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/*</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">dest</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">target</span><span class="o">/</span>&quot; <span class="o">\</span>    
+    <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">sample</span>
 </pre></div>
 
 
@@ -778,15 +767,15 @@ of a resource without having to specify 
 <p>By using the <code>:applyTo</code> request parameter it is possible to move multiple items in one single request. Moving items in this way leaves you with less control, though. In addition, if a single item move fails, no item at all is moved.</p>
 <p>When specifying the item(s) to be moved with the <code>:applyTo</code> parameter, the request resource is left untouched (unless of course if listed in the <code>:applyTo</code> parameter) and only used to resolve any relative paths in the <code>:applyTo</code> parameter.</p>
 <p>To for example move the <code>/content/page1</code> and <code>/content/page2</code> nodes to <code>/content/target</code>, you might use the following command line:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=move&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/page1&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/page2&quot;</span> <span class="o">\</span>    
-     <span class="o">-</span><span class="n">F</span><span class="s">&quot;:dest=/content/target/&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/s</span><span class="n">ample</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">move</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">page1</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">page2</span>&quot; <span class="o">\</span>    
+     <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">dest</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">target</span><span class="o">/</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">sample</span>
 </pre></div>
 
 
 <p>Please note the trailing slash character (<code>/</code>) in the value of the <code>:dest</code> parameter. This is required for multi-item move operations using the <code>:applyTo</code> parameter. The moved items are created below the node indicated by the <code>:dest</code>.</p>
 <p>Using a trailing star in the :applyTo parameter (as mentioned before), you can move all the children of the <code>/content</code> node, for example, as follows:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=move&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:applyTo=/content/*&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:dest=/content/target/&quot;</span> <span class="o">\</span>    
-    <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/s</span><span class="n">ample</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">move</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">applyTo</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/*</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">dest</span><span class="p">=</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">target</span><span class="o">/</span>&quot; <span class="o">\</span>    
+    <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">sample</span>
 </pre></div>
 
 
@@ -874,16 +863,16 @@ of a resource without having to specify 
 </tbody>
 </table>
 <p>For example the following command line imports the <code>/content/sample</code> page:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=import&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:contentType=json&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:name=sample&quot;</span> <span class="o">\</span>    
-   <span class="o">-</span><span class="n">F</span><span class="s">&quot;:content={ &#39;jcr:primaryType&#39;: &#39;nt:unstructured&#39;, &#39;propOne&#39; : &#39;propOneValue&#39;, &#39;childOne&#39; : { &#39;childPropOne&#39; : true } }&quot;</span> <span class="o">\</span>    
-   <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">import</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">contentType</span><span class="p">=</span><span class="n">json</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">name</span><span class="p">=</span><span class="n">sample</span>&quot; <span class="o">\</span>    
+   <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">content</span><span class="p">={</span> <span class="s">&#39;jcr:primaryType&#39;</span><span class="p">:</span> <span class="s">&#39;nt:unstructured&#39;</span><span class="p">,</span> <span class="s">&#39;propOne&#39;</span> <span class="p">:</span> <span class="s">&#39;propOneValue&#39;</span><span class="p">,</span> <span class="s">&#39;childOne&#39;</span> <span class="p">:</span> <span class="p">{</span> <span class="s">&#39;childPropOne&#39;</span> <span class="p">:</span> <span class="n">true</span> <span class="p">}</span> <span class="p">}</span>&quot; <span class="o">\</span>    
+   <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span>
 </pre></div>
 
 
 <p>For example the following command line imports the <code>/content/sample</code> page without the optional name parameter:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:operation=import&quot;</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:contentType=json&quot;</span>
-   <span class="o">-</span><span class="n">F</span><span class="s">&quot;:content={ &#39;sample&#39; : {&#39;propOne&#39; : &#39;propOneValue&#39;, &#39;childOne&#39; : { &#39;childPropOne&#39; : true } } }&quot;</span> <span class="o">\</span>    
-   <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">operation</span><span class="p">=</span><span class="n">import</span>&quot; <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">contentType</span><span class="p">=</span><span class="n">json</span>&quot;
+   <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">content</span><span class="p">={</span> <span class="s">&#39;sample&#39;</span> <span class="p">:</span> <span class="p">{</span><span class="s">&#39;propOne&#39;</span> <span class="p">:</span> <span class="s">&#39;propOneValue&#39;</span><span class="p">,</span> <span class="s">&#39;childOne&#39;</span> <span class="p">:</span> <span class="p">{</span> <span class="s">&#39;childPropOne&#39;</span> <span class="p">:</span> <span class="n">true</span> <span class="p">}</span> <span class="p">}</span> <span class="p">}</span>&quot; <span class="o">\</span>    
+   <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span>
 </pre></div>
 
 
@@ -998,7 +987,7 @@ of a resource without having to specify 
 </tbody>
 </table>
 <p>Note that simple content reordering can be requested without applying any other operations. This is easiest done by placing a request to the resource to be reordered and just setting the <code>:order</code> parameter. For example to order the <code>/content/sample/page5</code> resource above its sibling resource <code>/content/sample/other</code> a simple request</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">F</span><span class="s">&quot;:order=before other&quot;</span> <span class="n">http:</span><span class="sr">//</span><span class="n">host</span><span class="sr">/content/s</span><span class="n">ample</span><span class="o">/</span><span class="n">page5</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">F</span>&quot;<span class="p">:</span><span class="n">order</span><span class="p">=</span><span class="n">before</span> <span class="n">other</span>&quot; <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">host</span><span class="o">/</span><span class="n">content</span><span class="o">/</span><span class="n">sample</span><span class="o">/</span><span class="n">page5</span>
 </pre></div>
 
 

Modified: websites/staging/sling/trunk/content/documentation/bundles/mime-type-support-commons-mime.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/mime-type-support-commons-mime.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/mime-type-support-commons-mime.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"

Modified: websites/staging/sling/trunk/content/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/output-rewriting-pipelines-org-apache-sling-rewriter.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -113,9 +110,9 @@
 As the html generated by Sling is not required to be valid XHTML, the html parser is using an HTML parser to create valid SAX events. In order to perform this, the generator needs to buffer the whole response first.</p>
 <h2 id="implementing-pipeline-components">Implementing Pipeline Components</h2>
 <p>Each pipeline component type has a corresponding Java interface (Generator, Transformer, and Serializer) together with a factory interface (GeneratorFactory, TransformerFactory, and SerializerFactory). When implementing such a component, both interfaces need to be implemented. The factory has only one method which creates a new instance of that type for the current request. The factory has to be registered as a service. For example if you're using the Maven SCR plugin, it looks like this:</p>
-<div class="codehilite"><pre><span class="nv">@scr</span><span class="o">.</span><span class="n">component</span> <span class="n">metatype</span><span class="o">=</span><span class="s">&quot;no&quot;</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;TransformerFactory&quot;</span>
-<span class="nv">@scr</span><span class="o">.</span><span class="n">property</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;pipeline.type&quot;</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;validator&quot;</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">component</span> <span class="n">metatype</span><span class="p">=</span>&quot;<span class="n">no</span>&quot; 
+<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">TransformerFactory</span>&quot;
+<span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">property</span> <span class="n">value</span><span class="p">=</span>&quot;<span class="n">pipeline</span><span class="p">.</span><span class="n">type</span>&quot; <span class="n">value</span><span class="p">=</span>&quot;<span class="n">validator</span>&quot;
 </pre></div>
 
 
@@ -123,10 +120,10 @@ As the html generated by Sling is not re
 <h2 id="extending-the-pipeline">Extending the Pipeline</h2>
 <p>With the possibilities from above, it is possible to define new pipelines and add custom components to the pipeline. However, in some cases it is required to just add a custom transformer to the existing pipeline. Therefore the rewriting can be configured with pre and post transformers that are simply added to each configured pipeline. This allows a more flexible way of customizing the pipeline without changing/adding a configuration in the repository.</p>
 <p>The approach here is nearly the same. A transformer factory needs to be implemented, but instead of giving this factory a unique name, this factory is marked as a global factory:</p>
-<div class="codehilite"><pre><span class="nv">@scr</span><span class="o">.</span><span class="n">component</span> <span class="n">metatype</span><span class="o">=</span><span class="s">&quot;no&quot;</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;TransformerFactory&quot;</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;pipeline.mode&quot;</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;global&quot;</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;service.ranking&quot;</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;RANKING&quot;</span> <span class="n">type</span><span class="o">=</span><span class="s">&quot;Integer&quot;</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">component</span> <span class="n">metatype</span><span class="p">=</span>&quot;<span class="n">no</span>&quot;
+<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">TransformerFactory</span>&quot;
+<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">pipeline</span><span class="p">.</span><span class="n">mode</span>&quot; <span class="n">value</span><span class="p">=</span>&quot;<span class="k">global</span>&quot;
+<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">service</span><span class="p">.</span><span class="n">ranking</span>&quot; <span class="n">value</span><span class="p">=</span>&quot;<span class="n">RANKING</span>&quot; <span class="n">type</span><span class="p">=</span>&quot;<span class="n">Integer</span>&quot;
 </pre></div>
 
 
@@ -136,9 +133,9 @@ As the html generated by Sling is not re
 <p>A processor must conform to the Java interface <em>org.apache.sling.rewriter.Processor</em>. It gets initializd (method <em>init</em>) with the <em>ProcessingContext</em>. This context contains all necessary information for the current request (especially the output writer to write the rewritten content to).
 The <em>getWriter</em> method should return a writer where the output is written to. When the output is written or an error occured <em>finished</em> is called.</p>
 <p>Like the pipeline components a processor is generated by a factory which has to be registered as a service factory, like this:</p>
-<div class="codehilite"><pre><span class="nv">@scr</span><span class="o">.</span><span class="n">component</span> <span class="n">metatype</span><span class="o">=</span><span class="s">&quot;no&quot;</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;ProcessorFactory&quot;</span>
-<span class="nv">@scr</span><span class="o">.</span><span class="n">property</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;pipeline.type&quot;</span> <span class="n">value</span><span class="o">=</span><span class="s">&quot;uniqueName&quot;</span>
+<div class="codehilite"><pre><span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">component</span> <span class="n">metatype</span><span class="p">=</span>&quot;<span class="n">no</span>&quot; 
+<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">ProcessorFactory</span>&quot;
+<span class="p">@</span><span class="n">scr</span><span class="p">.</span><span class="n">property</span> <span class="n">value</span><span class="p">=</span>&quot;<span class="n">pipeline</span><span class="p">.</span><span class="n">type</span>&quot; <span class="n">value</span><span class="p">=</span>&quot;<span class="n">uniqueName</span>&quot;
 </pre></div>
 
 

Modified: websites/staging/sling/trunk/content/documentation/bundles/request-analysis.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/request-analysis.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/request-analysis.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -112,7 +109,7 @@ being processed: The <a href="http://sli
 <p>After that first line the complete data from the requests <code>RequestProgressTracker</code> is dumped.</p>
 <h2 id="analyzing-the-requesttrackertxt-file">Analyzing the <code>requesttracker.txt</code> file</h2>
 <p>To analyze the <code>requesttracker.txt</code> file the <em>Request Processing Analyzer</em> module can also be used as a standalone Java application. Just start the module using the <code>java</code> command:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">sling</span><span class="o">.</span><span class="n">reqanalyzer</span><span class="o">-</span><span class="mf">0.0.1</span><span class="o">-</span><span class="n">SNAPSHOT</span><span class="o">.</span><span class="n">jar</span> <span class="n">requesttracker</span><span class="o">.</span><span class="n">txt</span>
+<div class="codehilite"><pre>$ <span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">reqanalyzer</span><span class="o">-</span>0<span class="p">.</span>0<span class="p">.</span>1<span class="o">-</span><span class="n">SNAPSHOT</span><span class="p">.</span><span class="n">jar</span> <span class="n">requesttracker</span><span class="p">.</span><span class="n">txt</span>
 </pre></div>
 
 

Modified: websites/staging/sling/trunk/content/documentation/bundles/sling-health-check-tool.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/sling-health-check-tool.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/sling-health-check-tool.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"

Modified: websites/staging/sling/trunk/content/documentation/bundles/sling-settings-org-apache-sling-settings.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/sling-settings-org-apache-sling-settings.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/sling-settings-org-apache-sling-settings.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"

Modified: websites/staging/sling/trunk/content/documentation/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 Sun Jul  7 18:50:10 2013
@@ -83,11 +83,6 @@
       </div>
 
       
-      <div class="tip">
-           This page is a translated version of <a href="/site/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>
@@ -124,19 +119,19 @@
 <tbody>
 <tr>
 <td><code>users</code></td>
-<td><code>String</code>, <code>String[]()</code> or <code>Vector&lt;String&gt;</code></td>
+<td><code>String</code>, <code>String[]</code> or <code>Vector&lt;String&gt;</code></td>
 <td>admin</td>
 </tr>
 <tr>
 <td><code>groups</code></td>
-<td><code>String</code>, <code>String[]()</code> or <code>Vector&lt;String&gt;</code></td>
+<td><code>String</code>, <code>String[]</code> or <code>Vector&lt;String&gt;</code></td>
 <td>---</td>
 </tr>
 </tbody>
 </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. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
+        Rev. 1500501 by fmeschbe on Sun, 7 Jul 2013 18:49:51 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/documentation/bundles/xml-support.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/xml-support.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/xml-support.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"

Modified: websites/staging/sling/trunk/content/documentation/development/monitoring-requests.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/monitoring-requests.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/monitoring-requests.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"

Modified: websites/staging/sling/trunk/content/documentation/development/sling-testing-tools.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/sling-testing-tools.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/sling-testing-tools.html Sun Jul  7 18:50:10 2013
@@ -51,8 +51,7 @@
 <a href="/sitemap.html">Site Map</a></p>
 <p><strong>API Docs</strong>  <br />
 <a href="/apidocs/sling6/index.html">Sling 6</a> <br />
-<a href="/apidocs/sling5/index.html">Sling 5</a> <br />
-</p>
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
 <p><strong>Project info</strong> <br />
 <a href="/downloads.cgi">Downloads</a> <br />
 <a href="http://www.apache.org/licenses/">License</a> <br />
@@ -62,13 +61,11 @@
 <a href="/project-information.html">Project Information</a> <br />
 <a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
 <a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
-<a href="/project-information/security.html">Security</a> <br />
-</p>
+<a href="/project-information/security.html">Security</a>   </p>
 <p><strong>Sponsorship</strong> <br />
 <a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
 <a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
-<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
-</p>
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
 <!-- no valid ads for now, we'll  reactivate this when needed
 <iframe 
     src="http://www.apache.org/ads/button.html"
@@ -117,23 +114,23 @@ For tighter integration with Sling, the 
 <p>The <code>@TestReference</code> annotation is used to inject OSGi services in tests that are executed server side.The <code>BundleContext</code> can also be injected in this way, see the <a href="http://svn.apache.org/repos/asf/sling/trunk/testing/samples/sample-tests/src/main/java/org/apache/sling/testing/samples/sampletests/OsgiAwareTest.java">OsgiAwareTest</a> for an example.</p>
 <h2 id="curl-examples">Curl examples</h2>
 <p>Here's an example executing a few tests using curl:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">POST</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/system/s</span><span class="n">ling</span><span class="sr">/junit/o</span><span class="n">rg</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">testing</span><span class="o">.</span><span class="n">samples</span><span class="o">.</span><span class="n">sampletests</span><span class="o">.</span><span class="n">JUnit</span><span class="o">.</span><span class="n">json</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">POST</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">system</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">junit</span><span class="o">/</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">testing</span><span class="p">.</span><span class="n">samples</span><span class="p">.</span><span class="n">sampletests</span><span class="p">.</span><span class="n">JUnit</span><span class="p">.</span><span class="n">json</span>
 <span class="p">[{</span>
-    <span class="s">&quot;INFO_TYPE&quot;</span><span class="p">:</span> <span class="s">&quot;test&quot;</span><span class="p">,</span>
-    <span class="s">&quot;description&quot;</span><span class="p">:</span> <span class="s">&quot;testPasses(org.apache.sling.testing.samples.sampletests.JUnit3Test)&quot;</span>
+    &quot;<span class="n">INFO_TYPE</span>&quot;<span class="p">:</span> &quot;<span class="n">test</span>&quot;<span class="p">,</span>
+    &quot;<span class="n">description</span>&quot;<span class="p">:</span> &quot;<span class="n">testPasses</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">testing</span><span class="p">.</span><span class="n">samples</span><span class="p">.</span><span class="n">sampletests</span><span class="p">.</span><span class="n">JUnit3Test</span><span class="p">)</span>&quot;
   <span class="p">},{</span>
-    <span class="s">&quot;INFO_TYPE&quot;</span><span class="p">:</span> <span class="s">&quot;test&quot;</span><span class="p">,</span>
-    <span class="s">&quot;description&quot;</span><span class="p">:</span> <span class="s">&quot;testPasses(org.apache.sling.testing.samples.sampletests.JUnit4Test)&quot;</span>
+    &quot;<span class="n">INFO_TYPE</span>&quot;<span class="p">:</span> &quot;<span class="n">test</span>&quot;<span class="p">,</span>
+    &quot;<span class="n">description</span>&quot;<span class="p">:</span> &quot;<span class="n">testPasses</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">testing</span><span class="p">.</span><span class="n">samples</span><span class="p">.</span><span class="n">sampletests</span><span class="p">.</span><span class="n">JUnit4Test</span><span class="p">)</span>&quot;
   <span class="p">},{</span>
-    <span class="s">&quot;INFO_TYPE&quot;</span><span class="p">:</span> <span class="s">&quot;test&quot;</span><span class="p">,</span>
-    <span class="s">&quot;description&quot;</span><span class="p">:</span> <span class="s">&quot;testRequiresBefore(org.apache.sling.testing.samples.sampletests.JUnit4Test)&quot;</span>
+    &quot;<span class="n">INFO_TYPE</span>&quot;<span class="p">:</span> &quot;<span class="n">test</span>&quot;<span class="p">,</span>
+    &quot;<span class="n">description</span>&quot;<span class="p">:</span> &quot;<span class="n">testRequiresBefore</span><span class="p">(</span><span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">sling</span><span class="p">.</span><span class="n">testing</span><span class="p">.</span><span class="n">samples</span><span class="p">.</span><span class="n">sampletests</span><span class="p">.</span><span class="n">JUnit4Test</span><span class="p">)</span>&quot;
   <span class="p">}</span>
 <span class="p">]</span>
 </pre></div>
 
 
 <p>And another example with a test that fails:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">POST</span> <span class="n">http:</span><span class="sr">//</span><span class="n">localhost:8080</span><span class="sr">/system/s</span><span class="n">ling</span><span class="sr">/junit/o</span><span class="n">rg</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">testing</span><span class="o">.</span><span class="n">samples</span><span class="o">.</span><span class="n">failingtests</span><span class="o">.</span><span class="n">JUnit4FailingTest</span><span class="o">.</span><span class="n">json</span>
+<div class="codehilite"><pre>$ <span class="n">curl</span> <span class="o">-</span><span class="n">X</span> <span class="n">POST</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">system</span><span class="o">/</span><span class="n">sling</span><span class="o">/</span><span class="n">junit</span><span class="o">/</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">testing</span><span class="p">.</span><span class="n">samples</span><span class="p">.</span><span class="n">failingtests</span><span class="p">.</span><span class="n">JUnit4FailingTest</span><span class="p">.</span><span class="n">json</span>
 </pre></div>
 
 

Modified: websites/staging/sling/trunk/content/documentation/development/version-policy.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/version-policy.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/version-policy.html Sun Jul  7 18:50:10 2013
@@ -83,11 +83,6 @@
       </div>
 
       
-      <div class="tip">
-           This page is a translated version of <a href="/site/version-policy.html" target="sling_cwiki">/site/version-policy.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>Version Policy</h1>
       <p>This page is about how we assign versions to exported packages and bundles and defines when to increase which part of the version number.</p>
@@ -97,7 +92,13 @@ Please note that this page is currently 
 
 <div class="toc">
 <ul>
-<li><a href="#introduction">Introduction</a></li>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#big-sling-releases">Big Sling Releases</a></li>
+<li><a href="#sling-bundles">Sling Bundles</a></li>
+<li><a href="#package-exports">Package Exports</a></li>
+<li><a href="#future">Future</a></li>
+</ul>
+</li>
 <li><a href="#version-number-syntax">Version Number Syntax</a></li>
 <li><a href="#evolution-of-exported-package-versions">Evolution of Exported Package Versions</a></li>
 <li><a href="#evolution-of-bundle-versions">Evolution of Bundle Versions</a></li>
@@ -107,15 +108,18 @@ Please note that this page is currently 
 <li><a href="#pure-implementation-bundle">Pure Implementation Bundle</a></li>
 </ul>
 </li>
-<li><a href="#importing-packages">Importing Packages</a></li>
+<li><a href="#importing-packages">Importing Packages</a><ul>
+<li><a href="#future_1">Future</a></li>
+</ul>
+</li>
 <li><a href="#references">References</a></li>
 </ul>
 </div>
 <h2 id="introduction">Introduction</h2>
-<p>In comments to SLING-1176 Ian Boston wrote:</p>
-<p>{quote}
-The exports in bundle/api/pom.xml look like they might become problematic from a support point of view, although we probably can't avoid this. [...]() [The problem is the] manual maintenance of the version numbers. (not a big problem but needs to be done)
-{quote}</p>
+<p>In comments to <a href="https://issues.apache.org/jira/browse/SLING-2944">SLING-1176</a> Ian Boston wrote:</p>
+<blockquote>
+<p>The exports in bundle/api/pom.xml look like they might become problematic from a support point of view, although we probably can't avoid this. [...] [The problem is the] manual maintenance of the version numbers. (not a big problem but needs to be done)</p>
+</blockquote>
 <p>I agree, that this is a problem. So let me reasonate on this a bit ;-)</p>
 <p>As a reference you might want to read <a href="http://blog.meschberger.ch/2009/10/on-version-numbers.html">my blog post on version numbers</a> and also what the [Eclipse guys have to say|http://wiki.eclipse.org/index.php/Version_Numbering] (great read, btw). The OSGi Alliance has come up with a good definition for [Semantic Versioning|http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf] to which the definitions described below perfectly match.</p>
 <p>For Sling we have three kinds of version numbers:</p>
@@ -124,18 +128,18 @@ The exports in bundle/api/pom.xml look l
 <li>Sling Bundles</li>
 <li>Package Exports</li>
 </ol>
-<p><em>Big Sling Releases</em></p>
+<h3 id="big-sling-releases">Big Sling Releases</h3>
 <p>For <em>Big Sling releases</em> we already have an ample solution in that we just use a single number increased from release to release. Just remember that a <em>Big Sling release</em> is a convenience release of existing released Sling bundles.</p>
-<p><em>Sling Bundles</em></p>
+<h3 id="sling-bundles">Sling Bundles</h3>
 <p>For <em>Sling Bundles</em> version numbers are just defined as the <code>&lt;version&gt;</code> element of the bundle's POM. The only restriction here is, that we decided to use even numbers for releases and odd numbers for SNAPSHOTs. Whether and when which version part is increased is not explicitly defined yet.</p>
-<p><em>Package Exports</em></p>
+<h3 id="package-exports">Package Exports</h3>
 <p>For <em>Package Exports</em> the situation is more problematic since there are a number of places to set exported package version number:</p>
 <ul>
 <li>In a <code>packageinfo</code> file inside the package (picked up by the Maven Bundle Plugin to set the export version)</li>
 <li>Explicitly in the <code>&lt;Export-Package&gt;</code> element of the Maven Bundle Plugin configuration</li>
-<li>By reference to the bundle version number using the <code>$\{pom.version</code>} variable.</li>
+<li>By reference to the bundle version number using the <code>${pom.version}</code> variable.</li>
 </ul>
-<p>Upto now, we mostly used the <code>$\{pom.version</code> notation linking the exported package version to the bundle version. Over time this mechanism leads to a number of problems:</p>
+<p>Upto now, we mostly used the <code>${pom.version}</code> notation linking the exported package version to the bundle version. Over time this mechanism leads to a number of problems:</p>
 <ul>
 <li>For bundles with more than one package exported, the exported packages will evolve independently. As a consequence their versionin should also evolve independently. An example of such a bundle is the Sling API bundle of course.</li>
 <li>Linking the package export version number to the bundle version number confuses the actual semantics of both version numbers. The package export version number only indicates the version of the actual package while the bundle version number indicates a development state of the overall bundle. This will generally not be the same.</li>
@@ -150,7 +154,7 @@ The exports in bundle/api/pom.xml look l
 <p>But this would require defining the class source locations as resource location in the POM (at least for <code>packageinfo</code>) files.</p>
 <p>I am not sure ....</p>
 <p>This has not been discussed at large, but I would assume, that the POM is still the correct place to take note of the version of the exported packages.</p>
-<p><em>Future</em></p>
+<h3 id="future">Future</h3>
 <p>The newest versions of the BND library also support an <code>@Export</code> annotation in the <code>package-info.java</code> pseudo class file. This pseudo class is supported starting with Java 5 to take package level annotations (like the <code>@Export</code> annotation) and as a replacement of the <code>package-info.html</code> file.</p>
 <p>Using this syntax something like the following would be easily possible:</p>
 <div class="codehilite"><pre><span class="cm">/**</span>
@@ -162,17 +166,16 @@ The exports in bundle/api/pom.xml look l
 </pre></div>
 
 
-<p>See <a href="http://www.aqute.biz/Code/XBnd">Bnd Experimental</a> for details. Unfortunately the current Maven Bundle Plugin version does not support updating to the most recent BND library versions due to incompatibilities.</p>
+<p>See <a href="http://www.aqute.biz/Bnd/Versioning">BND Versioning</a> for details.</p>
 <h2 id="version-number-syntax">Version Number Syntax</h2>
 <p>As a small reminder, this is how a version number is constructed:  In OSGi version numbers are composed of four (4) segments: 3 integers and a string named major.minor.micro.qualifier.</p>
 <p>Each segment captures a different intent:</p>
-<div class="codehilite"><pre><span class="o">*</span> <span class="n">the</span> <span class="n">major</span> <span class="n">segment</span> <span class="n">indicates</span> <span class="n">breakage</span> <span class="n">in</span> <span class="n">the</span> <span class="n">API</span>
-<span class="o">*</span> <span class="n">the</span> <span class="n">minor</span> <span class="n">segment</span> <span class="n">indicates</span> <span class="o">*</span><span class="n">externally</span> <span class="n">visible</span><span class="o">*</span> <span class="n">changes</span>
-<span class="o">*</span> <span class="n">the</span> <span class="n">micro</span> <span class="n">segment</span> <span class="n">indicates</span> <span class="n">bug</span> <span class="n">fixes</span>
-<span class="o">*</span> <span class="n">the</span> <span class="n">qualifier</span> <span class="n">segment</span> <span class="n">is</span> <span class="n">not</span> <span class="n">generally</span> <span class="n">used</span> <span class="n">but</span> <span class="n">may</span> <span class="n">be</span> <span class="n">used</span> <span class="n">to</span> <span class="n">convey</span> <span class="n">more</span> <span class="n">information</span> <span class="n">about</span> <span class="n">a</span> <span class="n">particular</span> <span class="n">build</span><span class="p">,</span> <span class="n">such</span> <span class="n">as</span> <span class="n">a</span> <span class="n">build</span> <span class="n">time</span> <span class="n">or</span> <span class="n">an</span> <span class="n">SVN</span> <span class="n">revision</span> <span class="n">number</span><span class="p">.</span>
-</pre></div>
-
-
+<ul>
+<li>the major segment indicates breakage in the API</li>
+<li>the minor segment indicates <em>externally visible</em> changes</li>
+<li>the micro segment indicates bug fixes</li>
+<li>the qualifier segment is not generally used but may be used to convey more information about a particular build, such as a build time or an SVN revision number.</li>
+</ul>
 <h2 id="evolution-of-exported-package-versions">Evolution of Exported Package Versions</h2>
 <p>Version numbers of exported packages evolve independently from each other. Depending on the changes applied, the micro, minor, or major segement is increased. Whenever the major segment is increased, the minor and micro segments are reset to zero. Whenever the minor segment is increased, the micro segment is reset to zero.</p>
 <p>Segments are increased according to the above listing.</p>
@@ -198,23 +201,97 @@ The exports in bundle/api/pom.xml look l
 <p>To not break existing users of the unmodified packages, the exported versions of these packages must not be increased.</p>
 <p>To signal to users of evolving packages, that there might be new and interesting functionality, the version number must be increased according to above definition. This also conveys to the implementor(s) of the API, that they have to take some action.</p>
 <p>A hypothetical evolution of version numbers shown on two packages and the bundle version might be as follows</p>
-<p>| Description | <code>api</code> package | <code>resource</code> package | bundle |
-| Initial Release | 1.0.0 | 1.0.0 | 1.0.0 |
-| Bug fix in a <code>resource</code> class | 1.0.0 | 1.0.2 | 1.0.2 |
-| New API in the <code>resource</code> package | 1.0.0 | 1.1.0 | 1.1.0 |
-| New API in the <code>api</code> package | 1.1.0 | 1.1.0 | 1.2.0 |
-| API breakage in the <code>api</code> package | 2.0.0 | 1.1.0 | 2.0.0 |</p>
+<table>
+<thead>
+<tr>
+<th>Description</th>
+<th><code>api</code> package</th>
+<th><code>resource</code> package</th>
+<th>bundle</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Initial Release</td>
+<td>1.0.0</td>
+<td>1.0.0</td>
+<td>1.0.0</td>
+</tr>
+<tr>
+<td>Bug fix in a <code>resource</code> class</td>
+<td>1.0.0</td>
+<td>1.0.2</td>
+<td>1.0.2</td>
+</tr>
+<tr>
+<td>New API in the <code>resource</code> package</td>
+<td>1.0.0</td>
+<td>1.1.0</td>
+<td>1.1.0</td>
+</tr>
+<tr>
+<td>New API in the <code>api</code> package</td>
+<td>1.1.0</td>
+<td>1.1.0</td>
+<td>1.2.0</td>
+</tr>
+<tr>
+<td>API breakage in the <code>api</code> package</td>
+<td>2.0.0</td>
+<td>1.1.0</td>
+<td>2.0.0</td>
+</tr>
+</tbody>
+</table>
 <h3 id="implementation-bundle-providing-api">Implementation Bundle providing API</h3>
 <p>An example of such a hybrid bundle is the Sling Engine bundle. This bundle exports two packages themselves defining API and contains a number of internal packages which actually implement parts of the Sling API.</p>
 <p>A hypothetical evolution of version numbers shown on one exported package and the bundle version might be as follows</p>
-<p>| Description | <code>engine</code> package | bundle |
-| Initial Release | 1.0.0 | 1.0.0 |
-| Bug fix in a <code>engine</code> class | 1.0.2 | 1.0.2 |
-| Bug fix in an internal calss | 1.0.2 | 1.0.4 |
-| New API in the <code>engine</code> package | 1.1.0 | 1.1.0 |
-| Implement new API from <code>api</code> 1.1.0 | 1.1.0 | 1.2.0 |
-| Refactor internal classes | 1.1.0 | 1.3.0 |
-| Implement API from <code>api</code> 2.0.0 | 1.1.0 | 2.0.0 |</p>
+<table>
+<thead>
+<tr>
+<th>Description</th>
+<th><code>engine</code> package</th>
+<th>bundle</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Initial Release</td>
+<td>1.0.0</td>
+<td>1.0.0</td>
+</tr>
+<tr>
+<td>Bug fix in a <code>engine</code> class</td>
+<td>1.0.2</td>
+<td>1.0.2</td>
+</tr>
+<tr>
+<td>Bug fix in an internal calss</td>
+<td>1.0.2</td>
+<td>1.0.4</td>
+</tr>
+<tr>
+<td>New API in the <code>engine</code> package</td>
+<td>1.1.0</td>
+<td>1.1.0</td>
+</tr>
+<tr>
+<td>Implement new API from <code>api</code> 1.1.0</td>
+<td>1.1.0</td>
+<td>1.2.0</td>
+</tr>
+<tr>
+<td>Refactor internal classes</td>
+<td>1.1.0</td>
+<td>1.3.0</td>
+</tr>
+<tr>
+<td>Implement API from <code>api</code> 2.0.0</td>
+<td>1.1.0</td>
+<td>2.0.0</td>
+</tr>
+</tbody>
+</table>
 <h3 id="pure-implementation-bundle">Pure Implementation Bundle</h3>
 <p>For Pure Implementation Bundles only the bundle version numbers are maintained because there is no exported package whose version number needs to be managed. This makes the decision process of version number evolution very simple.</p>
 <h2 id="importing-packages">Importing Packages</h2>
@@ -236,16 +313,18 @@ The exports in bundle/api/pom.xml look l
 
 
 <p>This allows for the implementation to work correctly with bug fixed package exports but as soon as there are any <em>externally visible</em> changes, the implementation bundle has to be adapted -- even if this just means increasing the upper version bound in the <code>Import-Package</code> statement thus guaranteeing compliance (again).</p>
-<p><em>Future</em></p>
-<p>Recent versions of the BND library support automatic differntiation between use and implementation of API and to set the import version ranges accordingly. See <a href="http://www.aqute.biz/Code/XBnd">Bnd Experimental</a> for details. Unfortunately the current Maven Bundle Plugin version does not support updating to the most recent BND library versions due to incompatibilities.</p>
+<h3 id="future_1">Future</h3>
+<p>Recent versions of the BND library support automatic differntiation between use and implementation of API and to set the import version ranges accordingly. See <a href="http://www.aqute.biz/Bnd/Versioning">BND Versioning</a> for details.</p>
 <h2 id="references">References</h2>
-<p><a href="http://markmail.org/thread/zshobgjwtqrncajt">Version Numbers</a> -- The mail thread discussing version numbering
-<a href="http://blog.meschberger.ch/2009/10/on-version-numbers.html">On Version Numbers</a> -- Blog about version numbers
-<a href="http://wiki.eclipse.org/index.php/Version_Numbering">Version Numbering</a> -- An Eclipse paper on assigning version numbers. Very good read.
-<a href="http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf">Semantic Versioning</a> -- An OSGi Alliance paper on semantic versioning.
-<a href="http://www.aqute.biz/Code/XBnd">Bnd Experimental</a> -- Experimental extensions to the BND library; unfortunately these extensions are not yet usable with Maven Bundle Plugin 2.1.0 due to API changes in the BND library not supported by the plugin.</p>
+<ul>
+<li><a href="http://markmail.org/thread/zshobgjwtqrncajt">Version Numbers</a> -- The mail thread discussing version numbering</li>
+<li><a href="http://blog.meschberger.ch/2009/10/on-version-numbers.html">On Version Numbers</a> -- Blog about version numbers</li>
+<li><a href="http://wiki.eclipse.org/index.php/Version_Numbering">Version Numbering</a> -- An Eclipse paper on assigning version numbers. Very good read.</li>
+<li><a href="http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf">Semantic Versioning</a> -- An OSGi Alliance paper on semantic versioning.</li>
+<li><a href="http://www.aqute.biz/Bnd/Versioning">BND Versioning</a> -- Describes how the BND library used by the Maven Bundle plugin supports package versioning</li>
+</ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
+        Rev. 1500501 by fmeschbe on Sun, 7 Jul 2013 18:49:51 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project



Mime
View raw message