Author: buildbot
Date: Thu Mar 23 09:31:12 2017
New Revision: 1008845
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 Thu Mar 23 09:31:12 2017
@@ -1 +1 @@
-1788209
+1788210
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
Thu Mar 23 09:31:12 2017
@@ -117,10 +117,8 @@ h2:hover > .headerlink, h3:hover > .head
<div class="toc">
<ul>
<li><a href="#servlet-registration">Servlet Registration</a><ul>
-<li><a href="#caveats-when-binding-servlets-by-paths">Caveats when binding
servlets by paths</a><ul>
+<li><a href="#caveats-when-binding-servlets-by-paths">Caveats when binding
servlets by paths</a></li>
<li><a href="#registering-a-servlet-using-java-annotations">Registering a
Servlet using Java Annotations</a></li>
-</ul>
-</li>
<li><a href="#automated-tests">Automated tests</a></li>
<li><a href="#example-registration-by-path">Example: Registration by
Path</a></li>
<li><a href="#example-registration-by-resource-type-etc">Example: Registration
by Resource Type etc.</a></li>
@@ -147,7 +145,7 @@ to a script or and servlet.</p>
<tbody>
<tr>
<td><code>sling.servlet.paths</code></td>
-<td>A list of absolute paths under which the servlet is accessible as a
Resource. The property value must either be a single String, an array of
Strings or a Vector of Strings.<br>A servlet using this property might be
ignored unless its path is included in the <em>Execution Paths</em>
(<code>servletresolver.paths</code>) configuration setting of the
<code>SlingServletResolver</code> service. Either this property or the
<code>sling.servlet.resourceTypes</code> property must be set, or the servlet
is ignored. If both are set, the servlet is registered using both
ways.<br>Binding resources by paths is discouraged, see [caveats when binding
servlets by path](#caveats-when-binding-servlets-by-path] below.</td>
+<td>A list of absolute paths under which the servlet is accessible as a
Resource. The property value must either be a single String, an array of
Strings or a Vector of Strings.<br>A servlet using this property might be
ignored unless its path is included in the <em>Execution Paths</em>
(<code>servletresolver.paths</code>) configuration setting of the
<code>SlingServletResolver</code> service. Either this property or the
<code>sling.servlet.resourceTypes</code> property must be set, or the servlet
is ignored. If both are set, the servlet is registered using both
ways.<br>Binding resources by paths is discouraged, see <a
href="#caveats-when-binding-servlets-by-path">caveats when binding servlets by
path</a> below.</td>
</tr>
<tr>
<td><code>sling.servlet.resourceTypes</code></td>
@@ -184,7 +182,7 @@ to a script or and servlet.</p>
<li>the mapping is not transparent to a developer looking just at the
repository</li>
</ul>
<p>Given these drawbacks it is strongly recommended to bind servlets to
resource types rather than paths. </p>
-<h4 id="registering-a-servlet-using-java-annotations">Registering a Servlet
using Java Annotations<a class="headerlink"
href="#registering-a-servlet-using-java-annotations" title="Permanent
link">¶</a></h4>
+<h3 id="registering-a-servlet-using-java-annotations">Registering a Servlet
using Java Annotations<a class="headerlink"
href="#registering-a-servlet-using-java-annotations" title="Permanent
link">¶</a></h3>
<p>If you are working with the default Apache Sling development stack you can
either use </p>
<ul>
<li><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 </li>
@@ -308,7 +306,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. 1788209 by rombert on Thu, 23 Mar 2017 09:29:18 +0000
+ Rev. 1788210 by rombert on Thu, 23 Mar 2017 09:31:03 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
