Author: cziegeler
Date: Fri Mar 31 09:46:06 2017
New Revision: 1789647
URL: http://svn.apache.org/viewvc?rev=1789647&view=rev
Log:
SLING-6762 : Use target filter for servlet references
Modified:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
Modified:
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java?rev=1789647&r1=1789646&r2=1789647&view=diff
==============================================================================
---
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
(original)
+++
sling/trunk/bundles/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/internal/SlingServletResolver.java
Fri Mar 31 09:46:06 2017
@@ -933,7 +933,8 @@ public class SlingServletResolver
name = REF_SERVLET,
service = javax.servlet.Servlet.class,
cardinality = ReferenceCardinality.MULTIPLE,
- policy = ReferencePolicy.DYNAMIC)
+ policy = ReferencePolicy.DYNAMIC,
+ target="(|(" + ServletResolverConstants.SLING_SERVLET_PATHS +
"=*)(" + ServletResolverConstants.SLING_SERVLET_RESOURCE_TYPES + "=*))")
protected void bindServlet(final ServiceReference<Servlet> reference) {
boolean directCreate = true;
if (context == null) {
