You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2025/03/28 05:32:04 UTC

(sling-org-apache-sling-engine) 01/01: Merge pull request #59 from apache/jakarta-2-clean

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git

commit 13f34ce31f0b82060fbe0c7fcbb01703741c9ad1
Merge: baa566c dce8005
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Mar 28 06:31:58 2025 +0100

    Merge pull request #59 from apache/jakarta-2-clean
    
    SLING-12607 : Implement Jakarta Servlet based Sling API

 pom.xml                                            |  39 ++++-
 .../org/apache/sling/engine/EngineConstants.java   |   2 +
 .../apache/sling/engine/SlingRequestProcessor.java |  38 ++++-
 .../sling/engine/impl/DefaultErrorHandler.java     | 103 +++++++++---
 .../apache/sling/engine/impl/SlingHttpContext.java |  11 +-
 .../sling/engine/impl/SlingJakartaHttpContext.java |  96 +++++++++++
 ...ava => SlingJakartaHttpServletRequestImpl.java} |  48 +++---
 ...va => SlingJakartaHttpServletResponseImpl.java} |  56 ++-----
 .../apache/sling/engine/impl/SlingMainServlet.java |  25 ++-
 .../engine/impl/SlingRequestProcessorImpl.java     | 120 ++++++++------
 .../impl/adapter/SlingServletRequestAdapter.java   |  37 ++---
 .../impl/adapter/SlingServletResponseAdapter.java  |  39 ++---
 .../engine/impl/debug/RequestInfoProviderImpl.java |   8 +-
 .../debug/RequestProgressTrackerLogFilter.java     |  21 ++-
 .../impl/filter/AbstractSlingFilterChain.java      |  31 ++--
 .../sling/engine/impl/filter/ErrorFilterChain.java |  24 +--
 .../sling/engine/impl/filter/FilterHandle.java     |   7 +-
 .../sling/engine/impl/filter/FilterPredicate.java  |   9 +-
 .../impl/filter/RequestSlingFilterChain.java       |  11 +-
 .../engine/impl/filter/ServletFilterManager.java   |  50 +++++-
 .../impl/filter/SlingComponentFilterChain.java     |  11 +-
 .../engine/impl/filter/SlingFilterChainHelper.java |   4 +-
 .../impl/helper/ExternalServletContextWrapper.java | 109 +++++++------
 .../engine/impl/helper/RequestListenerManager.java |  40 ++++-
 .../engine/impl/helper/SlingFilterConfig.java      |   7 +-
 .../impl/helper/SlingJavaxServletContext.java      |  46 ++++++
 .../engine/impl/helper/SlingServletContext.java    | 118 ++++++++------
 .../sling/engine/impl/log/CustomLogFormat.java     |   3 +-
 .../sling/engine/impl/log/RequestLoggerFilter.java |  23 ++-
 .../engine/impl/log/RequestLoggerPreprocessor.java |  13 +-
 .../engine/impl/log/RequestLoggerRequest.java      |   9 +-
 .../engine/impl/log/RequestLoggerResponse.java     |  19 +--
 .../impl/parameters/MultipartRequestParameter.java |  12 +-
 .../sling/engine/impl/parameters/ParameterMap.java |   3 +-
 .../engine/impl/parameters/ParameterSupport.java   |  38 ++---
 .../ParameterSupportHttpServletRequestWrapper.java |   8 +-
 .../RequestParameterSupportConfigurer.java         |  23 ++-
 .../impl/parameters/RequestPartsIterator.java      |  28 ++--
 .../sling/engine/impl/parameters/SlingPart.java    |  10 +-
 .../sling/engine/impl/request/ContentData.java     |   3 +-
 .../sling/engine/impl/request/DispatchingInfo.java |   5 +-
 .../sling/engine/impl/request/RequestData.java     | 175 ++++++++++++---------
 .../impl/request/SlingRequestDispatcher.java       |  23 ++-
 .../java/org/apache/sling/engine/package-info.java |   2 +-
 .../impl/SlingHttpServletRequestImplTest.java      |  29 ++--
 .../impl/SlingHttpServletResponseImplTest.java     |  57 ++++---
 .../impl/debug/RequestInfoProviderImplTest.java    |   6 +-
 .../engine/impl/filter/AbstractFilterTest.java     |  19 ++-
 .../impl/filter/AbstractSlingFilterChainTest.java  |  29 ++--
 .../engine/impl/filter/ErrorFilterChainTest.java   |  25 ++-
 .../impl/filter/ServletFilterManagerTest.java      |  17 +-
 .../impl/filter/SlingFilterChainHelperTest.java    |   3 +-
 .../helper/ExternalServletContextWrapperTest.java  |  33 ++--
 .../impl/helper/SlingServletContextTest.java       |   5 +-
 .../engine/impl/log/ClientAbortExceptionTest.java  |   7 +-
 .../engine/impl/request/InitResourceTest.java      |   5 +-
 .../sling/engine/impl/request/RequestDataTest.java |  31 ++--
 .../impl/request/SlingRequestDispatcherTest.java   |  29 ++--
 58 files changed, 1059 insertions(+), 743 deletions(-)