This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch SLING-13355 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
commit 50c8f61e2faaa5fe9dda68abf88340e435bcb4f0 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Nov 11 15:34:11 2026 +0100 SLING-13355 Add constants for named Jakarta error handlers Co-authored-by: Copilot <[email protected]> --- .../sling/api/request/header/JakartaMediaRangeList.java | 7 +++++++ .../org/apache/sling/api/request/header/package-info.java | 2 +- .../org/apache/sling/api/servlets/JakartaErrorHandler.java | 14 ++++++++++++++ .../java/org/apache/sling/api/servlets/package-info.java | 2 +- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/sling/api/request/header/JakartaMediaRangeList.java b/src/main/java/org/apache/sling/api/request/header/JakartaMediaRangeList.java index 4a98646..98b43a7 100644 --- a/src/main/java/org/apache/sling/api/request/header/JakartaMediaRangeList.java +++ b/src/main/java/org/apache/sling/api/request/header/JakartaMediaRangeList.java @@ -45,6 +45,13 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa public static final String HEADER_ACCEPT = "Accept"; public static final String PARAM_ACCEPT = ":http-equiv-accept"; public static final String WILDCARD = "*"; + + /** + * The media type for HTML content. + * @since 1.2.0 + */ + public static final String CONTENT_TYPE_HTML = "text/html"; + boolean matchesAll = false; private static final Logger log = LoggerFactory.getLogger(JakartaMediaRangeList.class); diff --git a/src/main/java/org/apache/sling/api/request/header/package-info.java b/src/main/java/org/apache/sling/api/request/header/package-info.java index 24cb520..09b8624 100644 --- a/src/main/java/org/apache/sling/api/request/header/package-info.java +++ b/src/main/java/org/apache/sling/api/request/header/package-info.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -@Version("1.1.1") +@Version("1.2.0") package org.apache.sling.api.request.header; import org.osgi.annotation.versioning.Version; diff --git a/src/main/java/org/apache/sling/api/servlets/JakartaErrorHandler.java b/src/main/java/org/apache/sling/api/servlets/JakartaErrorHandler.java index 9a95cb3..e9932e1 100644 --- a/src/main/java/org/apache/sling/api/servlets/JakartaErrorHandler.java +++ b/src/main/java/org/apache/sling/api/servlets/JakartaErrorHandler.java @@ -33,6 +33,20 @@ import org.osgi.annotation.versioning.ConsumerType; @ConsumerType public interface JakartaErrorHandler { + /** + * The name of the service registration property for the error handler name. + * If the implementation supports named error handler instances, this property should + * be used to specify the name of the error handler instance. + * @since 2.6 + */ + String PROPERTY_NAME = "sling.error.handler"; + + /** + * The name of the error handler instance for non-HTML responses. + * @since 2.6 + */ + String NAME_NONHTML = "nonhtml"; + /** * Called to render a response for a HTTP status code. This method should * set the response status and print the status code and optional message. diff --git a/src/main/java/org/apache/sling/api/servlets/package-info.java b/src/main/java/org/apache/sling/api/servlets/package-info.java index 5d5a400..7a8f19f 100644 --- a/src/main/java/org/apache/sling/api/servlets/package-info.java +++ b/src/main/java/org/apache/sling/api/servlets/package-info.java @@ -17,7 +17,7 @@ * under the License. */ -@Version("2.5.0") +@Version("2.6") package org.apache.sling.api.servlets; import org.osgi.annotation.versioning.Version;
