Author: cziegeler
Date: Mon Aug 1 14:26:35 2016
New Revision: 1754756
URL: http://svn.apache.org/viewvc?rev=1754756&view=rev
Log:
SLING-5935 : Remove compat mode for filters
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=1754756&r1=1754755&r2=1754756&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
Mon Aug 1 14:26:35 2016
@@ -96,11 +96,6 @@ public class SlingMainServlet extends Ge
@Property(boolValue=DEFAULT_ALLOW_TRACE)
public static final String PROP_ALLOW_TRACE = "sling.trace.allow";
- public static final boolean DEFAULT_FILTER_COMPAT_MODE = false;
-
- @Property(boolValue=DEFAULT_FILTER_COMPAT_MODE)
- public static final String PROP_FILTER_COMPAT_MODE =
"sling.filter.compat.mode";
-
@Property(intValue = RequestHistoryConsolePlugin.STORED_REQUESTS_COUNT)
private static final String PROP_MAX_RECORD_REQUESTS =
"sling.max.record.requests";
@@ -425,8 +420,7 @@ public class SlingMainServlet extends Ge
// the HttpService as filter initialization may cause the servlet
// context to be required (see SLING-42)
filterManager = new ServletFilterManager(bundleContext,
- slingServletContext,
-
PropertiesUtil.toBoolean(componentConfig.get(PROP_FILTER_COMPAT_MODE),
DEFAULT_FILTER_COMPAT_MODE));
+ slingServletContext);
filterManager.open();
requestProcessor.setFilterManager(filterManager);
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java?rev=1754756&r1=1754755&r2=1754756&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
(original)
+++
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
Mon Aug 1 14:26:35 2016
@@ -103,13 +103,10 @@ public class ServletFilterManager extend
private final SlingFilterChainHelper[] filterChains;
- private final boolean compatMode;
-
private Map <Long, ServiceRegistration<FilterProcessorMBean>> mbeanMap;
public ServletFilterManager(final BundleContext context,
- final SlingServletContext servletContext,
- final boolean compatMode) {
+ final SlingServletContext servletContext) {
super(context, Filter.class, null);
this.servletContext = servletContext;
this.filterChains = new
SlingFilterChainHelper[FilterChainType.values().length];
@@ -118,7 +115,6 @@ public class ServletFilterManager extend
this.filterChains[FilterChainType.INCLUDE.ordinal()] = new
SlingFilterChainHelper();
this.filterChains[FilterChainType.FORWARD.ordinal()] = new
SlingFilterChainHelper();
this.filterChains[FilterChainType.COMPONENT.ordinal()] = new
SlingFilterChainHelper();
- this.compatMode = compatMode;
this.mbeanMap = new HashMap<Long,
ServiceRegistration<FilterProcessorMBean>>();
}
@@ -167,14 +163,6 @@ public class ServletFilterManager extend
if ( reference.getProperty(EngineConstants.SLING_FILTER_SCOPE) != null
|| reference.getProperty(EngineConstants.FILTER_SCOPE) != null ) {
exclude = false;
- } else {
- // in compat mode we allow all filters not having the felix
pattern prop!
- if ( this.compatMode ) {
- // Check if filter will be registered by Felix HttpService
Whiteboard
- if (reference.getProperty(FELIX_WHITEBOARD_PATTERN_PROPERTY)
== null) {
- exclude = false;
- }
- }
}
if ( !exclude ) {
final String filterName = SlingFilterConfig.getName(reference);
Modified:
sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1754756&r1=1754755&r2=1754756&view=diff
==============================================================================
---
sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
Mon Aug 1 14:26:35 2016
@@ -53,10 +53,6 @@ sling.max.record.requests.description =
sling.store.pattern.requests.name = Recorded Request Path Patterns
sling.store.pattern.requests.description = One or more regular expressions
which \
limit the requests which are stored by the "Recent Requests" Web Console page.
-sling.filter.compat.mode.name = Filter Compat Mode
-sling.filter.compat.mode.description = This switch controls the handling of \
- servlet filters. By default only filters with a scope property are
registered. \
- In compat mode, the scope property is not required.
sling.serverinfo.name = Server Info
sling.serverinfo.description = The server info returned by Sling. If this
field \
is left empty, Sling generates a default into.
