Author: buildbot
Date: Sun Nov 27 11:53:13 2016
New Revision: 1001703
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Nov 27 11:53:13 2016
@@ -1 +1 @@
-1771568
+1771569
Modified:
websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html
(original)
+++
websites/staging/sling/trunk/content/documentation/the-sling-engine/servlets.html
Sun Nov 27 11:53:13 2016
@@ -177,7 +177,9 @@ to a script or and servlet.</p>
<em> <a
href="https://osgi.org/javadoc/r6/cmpn/org/osgi/service/component/annotations/package-summary.html";>OSGi
DS annotations</a> (introduced with DS 1.2/OSGi 5, properly supported since <a
href="https://github.com/bndtools/bndtools/wiki/Changes-in-3.0.0";>bnd 3.0</a>,
being used in <a
href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html";>maven-bundle-plugin
3.0.0</a>) or
</em> Generic Felix SCR or Sling-specific <code>@SlingServlet</code>
annotations from <a
href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-scr-plugin.html";>Apache
Felix Maven SCR Plugin</a> to register your Sling servlets:</p>
<ol>
-<li>OSGi DS annotations (recommended)<div class="codehilite"><pre><span
class="nd">@Component</span><span class="o">(</span>
+<li>
+<p>OSGi DS annotations (recommended)</p>
+<div class="codehilite"><pre><span class="nd">@Component</span><span
class="o">(</span>
<span class="n">service</span> <span class="o">=</span> <span
class="o">{</span> <span class="n">Servlet</span><span class="o">.</span><span
class="na">class</span> <span class="o">},</span>
<span class="n">property</span> <span class="o">=</span> <span
class="o">{</span>
<span class="n">SLING_SERVLET_RESOURCE_TYPES</span> <span
class="o">+</span> <span class="s">"=/apps/my/type"</span>
@@ -196,11 +198,11 @@ to a script or and servlet.</p>
</pre></div>
-</li>
-</ol>
<p>Custom OSGi DS annotations (e.g. for Sling servlets) are not yet supported
by the OSGi spec (and therefore by bnd), but this is supposed to be fixed with
DS 1.4 (OSGi 7), see also <a
href="https://issues.apache.org/jira/browse/FELIX-5396";>FELIX-5396</a>).</p>
-<ol>
-<li>The <code>@SlingServlet</code> annotation (evaluated by
maven-scr-plugin)<div class="codehilite"><pre><span
class="nd">@SlingServlet</span><span class="o">(</span>
+</li>
+<li>
+<p>The <code>@SlingServlet</code> annotation (evaluated by
maven-scr-plugin)</p>
+<div class="codehilite"><pre><span class="nd">@SlingServlet</span><span
class="o">(</span>
<span class="n">resourceTypes</span> <span class="o">=</span> <span
class="s">"/apps/my/type"</span><span class="o">,</span>
<span class="n">selectors</span> <span class="o">=</span> <span
class="s">"hello"</span><span class="o">,</span>
<span class="n">extensions</span> <span class="o">=</span> <span
class="s">"html"</span><span class="o">,</span>
@@ -291,7 +293,7 @@ The mechanism helping the provider here
<h2 id="error-handler-servlets-or-scripts">Error Handler Servlet(s) or
Scripts<a class="headerlink" href="#error-handler-servlets-or-scripts"
title="Permanent link">¶</a></h2>
<p>Error handling support is described on the <a
href="/documentation/the-sling-engine/errorhandling.html">Errorhandling</a>
page.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1771568 by kwin on Sun, 27 Nov 2016 11:50:18 +0000
+ Rev. 1771569 by kwin on Sun, 27 Nov 2016 11:53:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
