Author: fmeschbe
Date: Mon Feb 17 08:25:34 2014
New Revision: 1568900
URL: http://svn.apache.org/r1568900
Log:
Request Parameter default encoding is now configured as part of the
org.apache.sling.parameters.config configuration.
Modified:
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
sling/whiteboard/fmeschbe/parameters/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
Modified:
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=1568900&r1=1568899&r2=1568900&view=diff
==============================================================================
---
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
(original)
+++
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
Mon Feb 17 08:25:34 2014
@@ -61,7 +61,6 @@ import org.apache.sling.engine.impl.requ
import org.apache.sling.engine.impl.request.RequestHistoryConsolePlugin;
import org.apache.sling.engine.jmx.RequestProcessorMBean;
import org.apache.sling.engine.servlets.ErrorHandler;
-import org.apache.sling.parameters.ParameterSupport;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
@@ -109,7 +108,6 @@ public class SlingMainServlet extends Ge
@Property(unbounded=PropertyUnbounded.ARRAY)
private static final String PROP_TRACK_PATTERNS_REQUESTS =
"sling.store.pattern.requests";
- @Property
private static final String PROP_DEFAULT_PARAMETER_ENCODING =
"sling.default.parameter.encoding";
@Reference
@@ -375,8 +373,14 @@ public class SlingMainServlet extends Ge
RequestData.setSlingMainServlet(this);
// configure default request parameter encoding
- ParameterSupport.setDefaultParameterEncoding(OsgiUtil.toString(
- componentConfig.get(PROP_DEFAULT_PARAMETER_ENCODING), null));
+ // log a message if such configuration exists ....
+ if (componentConfig.get(PROP_DEFAULT_PARAMETER_ENCODING) != null) {
+ log.warn("Configure default request parameter encoding with
'org.apache.sling.parameters.config' configuration; the property "
+ + PROP_DEFAULT_PARAMETER_ENCODING
+ + "="
+ + componentConfig.get(PROP_DEFAULT_PARAMETER_ENCODING)
+ + " is ignored");
+ }
// register the servlet and resources
try {
Modified:
sling/whiteboard/fmeschbe/parameters/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
URL:
http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/parameters/engine/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1568900&r1=1568899&r2=1568900&view=diff
==============================================================================
---
sling/whiteboard/fmeschbe/parameters/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
(original)
+++
sling/whiteboard/fmeschbe/parameters/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
Mon Feb 17 08:25:34 2014
@@ -57,14 +57,6 @@ sling.filter.compat.mode.name = Filter C
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.default.parameter.encoding.name = Default Parameter Encoding
-sling.default.parameter.encoding.description = The default request parameter \
- encoding used to decode request parameters into strings. If this property is \
- not set the default encoding is "ISO-8859-1" as mandated by the Servlet API \
- spec. This default encoding is used if the "_charset_" request parameter is \
- not set to another (supported) character encoding. Applications being sure \
- to always use the same encoding (e.g. UTF-8) can set this default here and \
- may omit the "_charset_" request parameter.
#
# Request Loggger Filter
