From 486ed85623e9b8deeec1f45f72f7859e6b71b4a6 Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Mon, 30 Dec 2024 16:04:34 -0600 Subject: [PATCH] Fixes #4184 - Refactor web.xml processing to hide WebXmlXXX as internal API (#4443) --- .../extension/webxml/WebXmlInitializer.java | 19 +++++--- .../extension/webxml/WebXmlManager.java | 43 ------------------- .../webxml/{ => internal}/WebXml.java | 2 +- .../{ => internal}/WebXmlContextParam.java | 2 +- .../{ => internal}/WebXmlDataSource.java | 2 +- .../{ => internal}/WebXmlErrorPage.java | 2 +- .../webxml/{ => internal}/WebXmlFilter.java | 2 +- .../{ => internal}/WebXmlFilterInitParam.java | 2 +- .../{ => internal}/WebXmlFilterMapping.java | 2 +- .../{ => internal}/WebXmlJspConfig.java | 2 +- .../{ => internal}/WebXmlJspConfigTaglib.java | 2 +- .../webxml/{ => internal}/WebXmlListener.java | 2 +- .../{ => internal}/WebXmlLoginConfig.java | 2 +- ...lWebXmlManager.java => WebXmlManager.java} | 12 +++--- .../{ => internal}/WebXmlMimeMapping.java | 2 +- ...nalWebXmlParser.java => WebXmlParser.java} | 24 ++--------- ...XmlProcessor.java => WebXmlProcessor.java} | 18 +------- .../WebXmlSecurityConstraint.java | 2 +- .../webxml/{ => internal}/WebXmlServlet.java | 2 +- .../WebXmlServletInitParam.java | 2 +- .../{ => internal}/WebXmlServletMapping.java | 2 +- .../WebXmlServletMultipartConfig.java | 2 +- .../WebXmlServletSecurityRoleRef.java | 2 +- .../{ => internal}/WebXmlSessionConfig.java | 2 +- .../WebXmlSessionConfigCookieConfig.java | 2 +- .../webxml/src/main/java/module-info.java | 11 +---- .../{ => internal}/ContextParamTest.java | 3 +- .../webxml/{ => internal}/DataSourceTest.java | 3 +- .../DefaultContextPathTest.java | 3 +- .../DenyUncoveredMethodsTest.java | 2 +- .../EffectiveMajorVersionTest.java | 3 +- .../webxml/{ => internal}/ErrorPageTest.java | 3 +- .../{ => internal}/FilterMappingTest.java | 3 +- .../webxml/{ => internal}/JspConfigTest.java | 3 +- .../{ => internal}/MetadataCompleteTest.java | 3 +- .../{ => internal}/MimeMappingTest.java | 3 +- .../TestWithoutLeadingSlashServlet.java | 2 +- ...anagerTest.java => WebXmlManagerTest.java} | 35 ++++++++------- ...lParserTest.java => WebXmlParserTest.java} | 14 +++--- ...ssorTest.java => WebXmlProcessorTest.java} | 8 ++-- .../{ => internal}/WelcomeFileTest.java | 3 +- .../WithoutLeadingSlashTest.java | 3 +- .../withoutLeadingSlash1/WEB-INF/web.xml | 2 +- 43 files changed, 97 insertions(+), 166 deletions(-) delete mode 100644 extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlManager.java rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXml.java (99%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlContextParam.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlDataSource.java (98%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlErrorPage.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlFilter.java (98%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlFilterInitParam.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlFilterMapping.java (98%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlJspConfig.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlJspConfigTaglib.java (98%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlListener.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlLoginConfig.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/{InternalWebXmlManager.java => WebXmlManager.java} (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlMimeMapping.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/{InternalWebXmlParser.java => WebXmlParser.java} (96%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/{InternalWebXmlProcessor.java => WebXmlProcessor.java} (96%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlSecurityConstraint.java (99%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlServlet.java (99%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlServletInitParam.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlServletMapping.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlServletMultipartConfig.java (98%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlServletSecurityRoleRef.java (97%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlSessionConfig.java (98%) rename extension/webxml/src/main/java/cloud/piranha/extension/webxml/{ => internal}/WebXmlSessionConfigCookieConfig.java (97%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/ContextParamTest.java (95%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/DataSourceTest.java (96%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/DefaultContextPathTest.java (95%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/DenyUncoveredMethodsTest.java (98%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/EffectiveMajorVersionTest.java (95%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/ErrorPageTest.java (97%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/FilterMappingTest.java (96%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/JspConfigTest.java (96%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/MetadataCompleteTest.java (95%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/MimeMappingTest.java (95%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/TestWithoutLeadingSlashServlet.java (97%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/{InternalWebXmlManagerTest.java => WebXmlManagerTest.java} (88%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/{InternalWebXmlParserTest.java => WebXmlParserTest.java} (92%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/{InternalWebXmlProcessorTest.java => WebXmlProcessorTest.java} (89%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/WelcomeFileTest.java (97%) rename extension/webxml/src/test/java/cloud/piranha/extension/webxml/{ => internal}/WithoutLeadingSlashTest.java (96%) diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlInitializer.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlInitializer.java index 18e1618640..c0a72437c7 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlInitializer.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlInitializer.java @@ -27,10 +27,15 @@ */ package cloud.piranha.extension.webxml; -import cloud.piranha.extension.webxml.internal.InternalWebXmlParser; -import cloud.piranha.extension.webxml.internal.InternalWebXmlProcessor; -import cloud.piranha.extension.webxml.internal.InternalWebXmlManager; +import cloud.piranha.extension.webxml.internal.WebXmlParser; +import cloud.piranha.extension.webxml.internal.WebXmlProcessor; +import cloud.piranha.extension.webxml.internal.WebXmlManager; import cloud.piranha.core.api.WebApplication; +import cloud.piranha.extension.webxml.internal.WebXmlManager; +import cloud.piranha.extension.webxml.internal.WebXmlParser; +import cloud.piranha.extension.webxml.internal.WebXmlProcessor; +import cloud.piranha.extension.webxml.internal.WebXml; +import cloud.piranha.extension.webxml.internal.WebXmlServletMapping; import jakarta.servlet.ServletContainerInitializer; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; @@ -76,10 +81,10 @@ public void onStartup(Set> classes, ServletContext servletContext) thro try { WebApplication webApplication = (WebApplication) servletContext; - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); webApplication.setAttribute("cloud.piranha.extension.webxml.WebXmlManager", manager); - InternalWebXmlParser parser = new InternalWebXmlParser(); + WebXmlParser parser = new WebXmlParser(); InputStream inputStream = servletContext.getResourceAsStream("WEB-INF/web.xml"); if (inputStream != null) { WebXml webXml = parser.parse(servletContext.getResourceAsStream("WEB-INF/web.xml")); @@ -106,7 +111,7 @@ public void onStartup(Set> classes, ServletContext servletContext) thro if (manager.getWebXml() != null) { WebXml webXml = manager.getWebXml(); - InternalWebXmlProcessor processor = new InternalWebXmlProcessor(); + WebXmlProcessor processor = new WebXmlProcessor(); processor.process(webXml, webApplication); @@ -134,7 +139,7 @@ public void onStartup(Set> classes, ServletContext servletContext) thro * @param webApp the web application. * @param manager the web.xml manager. */ - private void removeExistingServletMappings(WebApplication webApp, InternalWebXmlManager manager) { + private void removeExistingServletMappings(WebApplication webApp, WebXmlManager manager) { for(WebXmlServletMapping mapping : manager.getWebXml().getServletMappings()) { for(WebXml fragment : manager.getOrderedFragments()) { ArrayList candidateList = new ArrayList<>(fragment.getServletMappings()); diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlManager.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlManager.java deleted file mode 100644 index b8fb4e3afb..0000000000 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlManager.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2002-2024 Manorrock.com. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -package cloud.piranha.extension.webxml; - -/** - * The WebXmlManager API. - * - * @author Manfred Riem (mriem@manorrock.com) - */ -public interface WebXmlManager { - - /** - * Get the web.xml. - * - * @return the web.xml - */ - WebXml getWebXml(); -} diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXml.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXml.java similarity index 99% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXml.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXml.java index 08d400d440..89b3ac0e48 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXml.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXml.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import java.io.Serializable; import java.util.ArrayList; diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlContextParam.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlContextParam.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlContextParam.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlContextParam.java index e7b5e68a37..4bfc769b9f 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlContextParam.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlContextParam.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A context-param inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlDataSource.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlDataSource.java similarity index 98% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlDataSource.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlDataSource.java index 1f1879af52..8dd75f0bb2 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlDataSource.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlDataSource.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import java.util.HashMap; import java.util.Map; diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlErrorPage.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlErrorPage.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlErrorPage.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlErrorPage.java index 61d9ac85d4..590e06502d 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlErrorPage.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlErrorPage.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * An error-page inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilter.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilter.java similarity index 98% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilter.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilter.java index 560bca680b..c29536a6cc 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilter.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilter.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import java.util.ArrayList; import java.util.List; diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilterInitParam.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilterInitParam.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilterInitParam.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilterInitParam.java index b79be85caf..445e535b5a 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilterInitParam.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilterInitParam.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A filter init-param inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilterMapping.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilterMapping.java similarity index 98% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilterMapping.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilterMapping.java index 77c0785ffd..ebf994cb8f 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlFilterMapping.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlFilterMapping.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import java.util.ArrayList; import java.util.List; diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlJspConfig.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlJspConfig.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlJspConfig.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlJspConfig.java index ab1ba19ca5..4018d8f2db 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlJspConfig.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlJspConfig.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import java.util.ArrayList; import java.util.List; diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlJspConfigTaglib.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlJspConfigTaglib.java similarity index 98% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlJspConfigTaglib.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlJspConfigTaglib.java index 6af1bc7888..ea6008e8e8 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlJspConfigTaglib.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlJspConfigTaglib.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A taglib inside jsp-config of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlListener.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlListener.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlListener.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlListener.java index d93cc3259d..edb535e718 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlListener.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlListener.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A listener inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlLoginConfig.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlLoginConfig.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlLoginConfig.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlLoginConfig.java index 7546713834..7b6040d5a6 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlLoginConfig.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlLoginConfig.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A login-config inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlManager.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlManager.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlManager.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlManager.java index 4b2bf0e265..a1b871d16c 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlManager.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlManager.java @@ -27,9 +27,7 @@ */ package cloud.piranha.extension.webxml.internal; -import cloud.piranha.extension.webxml.WebXml; -import static cloud.piranha.extension.webxml.WebXml.OTHERS_TAG; -import cloud.piranha.extension.webxml.WebXmlManager; +import static cloud.piranha.extension.webxml.internal.WebXml.OTHERS_TAG; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -47,7 +45,7 @@ * * @author Manfred Riem (mriem@manorrock.com) */ -public class InternalWebXmlManager implements WebXmlManager { +public class WebXmlManager { /** * Stores the initial web.xml @@ -96,7 +94,11 @@ public void setWebFragments(List webFragments) { this.webFragments = webFragments; } - @Override + /** + * Get the web.xml. + * + * @return the web.xml. + */ public WebXml getWebXml() { return webXml; } diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlMimeMapping.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlMimeMapping.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlMimeMapping.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlMimeMapping.java index 4a412aec32..e0f1ba4809 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlMimeMapping.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlMimeMapping.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A mime-mapping inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlParser.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlParser.java similarity index 96% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlParser.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlParser.java index 0e5c5790bb..2ea0dbcd0f 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlParser.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlParser.java @@ -27,7 +27,7 @@ */ package cloud.piranha.extension.webxml.internal; -import static cloud.piranha.extension.webxml.WebXml.OTHERS_TAG; +import static cloud.piranha.extension.webxml.internal.WebXml.OTHERS_TAG; import static java.lang.System.Logger.Level.DEBUG; import static java.lang.System.Logger.Level.WARNING; import static java.util.regex.Pattern.quote; @@ -55,31 +55,13 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import cloud.piranha.extension.webxml.WebXml; -import cloud.piranha.extension.webxml.WebXmlContextParam; -import cloud.piranha.extension.webxml.WebXmlDataSource; -import cloud.piranha.extension.webxml.WebXmlErrorPage; -import cloud.piranha.extension.webxml.WebXmlFilter; -import cloud.piranha.extension.webxml.WebXmlFilterInitParam; -import cloud.piranha.extension.webxml.WebXmlFilterMapping; -import cloud.piranha.extension.webxml.WebXmlJspConfigTaglib; -import cloud.piranha.extension.webxml.WebXmlListener; -import cloud.piranha.extension.webxml.WebXmlLoginConfig; -import cloud.piranha.extension.webxml.WebXmlMimeMapping; -import cloud.piranha.extension.webxml.WebXmlSecurityConstraint; -import cloud.piranha.extension.webxml.WebXmlServlet; -import cloud.piranha.extension.webxml.WebXmlServletInitParam; -import cloud.piranha.extension.webxml.WebXmlServletMapping; -import cloud.piranha.extension.webxml.WebXmlServletMultipartConfig; -import cloud.piranha.extension.webxml.WebXmlServletSecurityRoleRef; -import cloud.piranha.extension.webxml.WebXmlSessionConfig; /** * The web.xml / web-fragment.xml parser. * * @author Manfred Riem (mriem@manorrock.com) */ -public class InternalWebXmlParser { +public class WebXmlParser { /** * Stores the 'location/text()' selector. @@ -89,7 +71,7 @@ public class InternalWebXmlParser { /** * Stores the logger. */ - private static final Logger LOGGER = System.getLogger(InternalWebXmlParser.class.getName()); + private static final Logger LOGGER = System.getLogger(WebXmlParser.class.getName()); /** * Stores the 'param-name/text()' selector. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlProcessor.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlProcessor.java similarity index 96% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlProcessor.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlProcessor.java index 8feeeb3df6..86f7697cd8 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/InternalWebXmlProcessor.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlProcessor.java @@ -52,23 +52,9 @@ import cloud.piranha.core.api.SecurityRoleReference; import cloud.piranha.core.api.SecurityWebResourceCollection; import cloud.piranha.core.api.WebApplication; -import cloud.piranha.extension.webxml.WebXml; -import cloud.piranha.extension.webxml.WebXmlContextParam; -import cloud.piranha.extension.webxml.WebXmlDataSource; -import cloud.piranha.extension.webxml.WebXmlErrorPage; -import cloud.piranha.extension.webxml.WebXmlFilterInitParam; -import cloud.piranha.extension.webxml.WebXmlJspConfigTaglib; -import cloud.piranha.extension.webxml.WebXmlListener; -import cloud.piranha.extension.webxml.WebXmlLoginConfig; -import cloud.piranha.extension.webxml.WebXmlServlet; -import cloud.piranha.extension.webxml.WebXmlServletMapping; -import cloud.piranha.extension.webxml.WebXmlServletMultipartConfig; -import cloud.piranha.extension.webxml.WebXmlSessionConfig; import cloud.piranha.core.api.WelcomeFileManager; import cloud.piranha.core.impl.DefaultJspConfigDescriptor; import cloud.piranha.core.impl.DefaultTaglibDescriptor; -import cloud.piranha.extension.webxml.WebXmlSecurityConstraint; -import cloud.piranha.extension.webxml.WebXmlServletSecurityRoleRef; import jakarta.servlet.DispatcherType; import jakarta.servlet.FilterRegistration; import jakarta.servlet.MultipartConfigElement; @@ -81,12 +67,12 @@ * * @author Manfred Riem (mriem@manorrock.com) */ -public class InternalWebXmlProcessor { +public class WebXmlProcessor { /** * Stores the logger. */ - private static final Logger LOGGER = System.getLogger(InternalWebXmlProcessor.class.getName()); + private static final Logger LOGGER = System.getLogger(WebXmlProcessor.class.getName()); /** * Stores the empty string array. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSecurityConstraint.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSecurityConstraint.java similarity index 99% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSecurityConstraint.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSecurityConstraint.java index 101517156c..1e7a3afa57 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSecurityConstraint.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSecurityConstraint.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import java.util.ArrayList; import java.util.List; diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServlet.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServlet.java similarity index 99% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServlet.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServlet.java index a2b5c075a4..2d3b735867 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServlet.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServlet.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import java.util.ArrayList; import java.util.List; diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletInitParam.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletInitParam.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletInitParam.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletInitParam.java index 5f8bdba032..128a62fc61 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletInitParam.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletInitParam.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A servlet init-param inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletMapping.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletMapping.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletMapping.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletMapping.java index c0512c073e..69d4e81855 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletMapping.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletMapping.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A servlet-mapping inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletMultipartConfig.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletMultipartConfig.java similarity index 98% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletMultipartConfig.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletMultipartConfig.java index f0512e97d6..3ede0445bb 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletMultipartConfig.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletMultipartConfig.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A servlet multipart-config inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletSecurityRoleRef.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletSecurityRoleRef.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletSecurityRoleRef.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletSecurityRoleRef.java index 52164cb77c..24edea475c 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlServletSecurityRoleRef.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlServletSecurityRoleRef.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A servlet security-role-ref inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSessionConfig.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSessionConfig.java similarity index 98% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSessionConfig.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSessionConfig.java index 3e88bd5fac..efd8e23f79 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSessionConfig.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSessionConfig.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A session-config inside of web.xml or web-fragment.xml. diff --git a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSessionConfigCookieConfig.java b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSessionConfigCookieConfig.java similarity index 97% rename from extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSessionConfigCookieConfig.java rename to extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSessionConfigCookieConfig.java index 010b7e3bce..5f8e13da39 100644 --- a/extension/webxml/src/main/java/cloud/piranha/extension/webxml/WebXmlSessionConfigCookieConfig.java +++ b/extension/webxml/src/main/java/cloud/piranha/extension/webxml/internal/WebXmlSessionConfigCookieConfig.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * A session-config cookie-config inside of web.xml/web-fragment.xml. diff --git a/extension/webxml/src/main/java/module-info.java b/extension/webxml/src/main/java/module-info.java index c1ca7cbaa5..2cc41bd711 100644 --- a/extension/webxml/src/main/java/module-info.java +++ b/extension/webxml/src/main/java/module-info.java @@ -29,21 +29,14 @@ /** * This module delivers the web.xml processing extension. * - *

- * Note that this extension allows you to inspect the effective WebXml to make - * sure it was processed correctly. It is however NOT RECOMMENDED that other - * extensions or initializers directly use the WebXmlManager API to configure - * themselves, but instead use other manager APIs or the WebApplication API. - *

- * * @author Manfred Riem (mriem@manorrock.com) */ module cloud.piranha.extension.webxml { exports cloud.piranha.extension.webxml; opens cloud.piranha.extension.webxml; - requires transitive cloud.piranha.core.api; - requires cloud.piranha.core.impl; + requires static cloud.piranha.core.api; + requires static cloud.piranha.core.impl; requires static java.naming; requires static java.sql; requires java.xml; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/ContextParamTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/ContextParamTest.java similarity index 95% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/ContextParamTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/ContextParamTest.java index dcea895a63..873f69ee13 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/ContextParamTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/ContextParamTest.java @@ -25,9 +25,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import java.io.File; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/DataSourceTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DataSourceTest.java similarity index 96% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/DataSourceTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DataSourceTest.java index 969d168cd1..3e97c58deb 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/DataSourceTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DataSourceTest.java @@ -25,11 +25,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; import cloud.piranha.core.impl.DefaultWebApplicationExtensionContext; import cloud.piranha.extension.herring.HerringExtension; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import java.io.File; import javax.naming.InitialContext; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/DefaultContextPathTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DefaultContextPathTest.java similarity index 95% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/DefaultContextPathTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DefaultContextPathTest.java index d6cbc7994c..4db95542da 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/DefaultContextPathTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DefaultContextPathTest.java @@ -25,9 +25,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import java.io.File; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/DenyUncoveredMethodsTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DenyUncoveredMethodsTest.java similarity index 98% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/DenyUncoveredMethodsTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DenyUncoveredMethodsTest.java index ff0a9d0418..74bf6cad84 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/DenyUncoveredMethodsTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/DenyUncoveredMethodsTest.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; /** * The JUnit tests testing web.xml <context-param>. diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/EffectiveMajorVersionTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/EffectiveMajorVersionTest.java similarity index 95% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/EffectiveMajorVersionTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/EffectiveMajorVersionTest.java index a56326c0dd..f579ee9711 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/EffectiveMajorVersionTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/EffectiveMajorVersionTest.java @@ -25,9 +25,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import java.io.File; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/ErrorPageTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/ErrorPageTest.java similarity index 97% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/ErrorPageTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/ErrorPageTest.java index 1554a809b5..956d1ec415 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/ErrorPageTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/ErrorPageTest.java @@ -25,11 +25,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; import cloud.piranha.core.impl.DefaultWebApplicationRequest; import cloud.piranha.core.impl.DefaultWebApplicationResponse; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import static jakarta.servlet.DispatcherType.REQUEST; import java.io.File; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/FilterMappingTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/FilterMappingTest.java similarity index 96% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/FilterMappingTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/FilterMappingTest.java index 0b3928be41..a19ee4edb4 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/FilterMappingTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/FilterMappingTest.java @@ -25,10 +25,11 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.api.FilterEnvironment; import cloud.piranha.core.impl.DefaultWebApplication; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import jakarta.servlet.FilterRegistration; import java.io.File; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/JspConfigTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/JspConfigTest.java similarity index 96% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/JspConfigTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/JspConfigTest.java index 79362d7e6a..c043b581de 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/JspConfigTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/JspConfigTest.java @@ -25,11 +25,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; import cloud.piranha.resource.impl.DirectoryResource; import cloud.piranha.extension.wasp.WaspJspManagerInitializer; +import cloud.piranha.extension.webxml.WebXmlInitializer; import jakarta.servlet.descriptor.JspConfigDescriptor; import java.io.File; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/MetadataCompleteTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/MetadataCompleteTest.java similarity index 95% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/MetadataCompleteTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/MetadataCompleteTest.java index a4f5c51b19..e00ae21ab4 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/MetadataCompleteTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/MetadataCompleteTest.java @@ -25,9 +25,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import java.io.File; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/MimeMappingTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/MimeMappingTest.java similarity index 95% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/MimeMappingTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/MimeMappingTest.java index a24f9f8f41..79b398ae86 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/MimeMappingTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/MimeMappingTest.java @@ -25,9 +25,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import java.io.File; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/TestWithoutLeadingSlashServlet.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/TestWithoutLeadingSlashServlet.java similarity index 97% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/TestWithoutLeadingSlashServlet.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/TestWithoutLeadingSlashServlet.java index 4f71c3f9be..860aa50288 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/TestWithoutLeadingSlashServlet.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/TestWithoutLeadingSlashServlet.java @@ -25,7 +25,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlManagerTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlManagerTest.java similarity index 88% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlManagerTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlManagerTest.java index 60ac6f3abc..e8bebf6602 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlManagerTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlManagerTest.java @@ -27,8 +27,7 @@ */ package cloud.piranha.extension.webxml.internal; -import cloud.piranha.extension.webxml.WebXml; -import static cloud.piranha.extension.webxml.WebXml.OTHERS_TAG; +import static cloud.piranha.extension.webxml.internal.WebXml.OTHERS_TAG; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -38,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -class InternalWebXmlManagerTest { +class WebXmlManagerTest { private static WebXml toWebFragment(String fragmentName) { WebXml fragment = new WebXml(); @@ -48,14 +47,14 @@ private static WebXml toWebFragment(String fragmentName) { @Test void testNoOrdering() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); List fragmentNames = Arrays.asList("a", "b", "c", "d", "e"); Collections.shuffle(fragmentNames); - manager.setWebFragments(fragmentNames.stream().map(InternalWebXmlManagerTest::toWebFragment).toList()); + manager.setWebFragments(fragmentNames.stream().map(WebXmlManagerTest::toWebFragment).toList()); List orderedFragments = manager.getOrderedFragments(); assertEquals(5, orderedFragments.size()); @@ -68,7 +67,7 @@ void testNoOrdering() { @Test void testAbsoluteOrdering() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); @@ -77,7 +76,7 @@ void testAbsoluteOrdering() { List fragmentNames = Arrays.asList("a", "b", "c", "d", "e"); Collections.shuffle(fragmentNames); - manager.setWebFragments(fragmentNames.stream().map(InternalWebXmlManagerTest::toWebFragment).toList()); + manager.setWebFragments(fragmentNames.stream().map(WebXmlManagerTest::toWebFragment).toList()); List orderedFragments = manager.getOrderedFragments(); assertEquals(3, orderedFragments.size()); @@ -88,7 +87,7 @@ void testAbsoluteOrdering() { @Test void testAbsoluteOrdering2() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); @@ -97,7 +96,7 @@ void testAbsoluteOrdering2() { List fragmentNames = Arrays.asList("a", "b", "c", "d", "e"); Collections.shuffle(fragmentNames); - manager.setWebFragments(fragmentNames.stream().map(InternalWebXmlManagerTest::toWebFragment).toList()); + manager.setWebFragments(fragmentNames.stream().map(WebXmlManagerTest::toWebFragment).toList()); List orderedFragments = manager.getOrderedFragments(); assertEquals(3, orderedFragments.size()); @@ -108,7 +107,7 @@ void testAbsoluteOrdering2() { @Test void testAbsoluteOrdering3() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); @@ -117,7 +116,7 @@ void testAbsoluteOrdering3() { List fragmentNames = Arrays.asList("a", "b", "c", "d", "e"); Collections.shuffle(fragmentNames); - manager.setWebFragments(fragmentNames.stream().map(InternalWebXmlManagerTest::toWebFragment).toList()); + manager.setWebFragments(fragmentNames.stream().map(WebXmlManagerTest::toWebFragment).toList()); List orderedFragments = manager.getOrderedFragments(); assertEquals(5, orderedFragments.size()); @@ -130,7 +129,7 @@ void testAbsoluteOrdering3() { @Test void testAbsoluteOrdering4() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); @@ -139,7 +138,7 @@ void testAbsoluteOrdering4() { List fragmentNames = Arrays.asList("a", "b", "c", "d", "e"); Collections.shuffle(fragmentNames); - manager.setWebFragments(fragmentNames.stream().map(InternalWebXmlManagerTest::toWebFragment).toList()); + manager.setWebFragments(fragmentNames.stream().map(WebXmlManagerTest::toWebFragment).toList()); List orderedFragments = manager.getOrderedFragments(); assertEquals(5, orderedFragments.size()); @@ -152,7 +151,7 @@ void testAbsoluteOrdering4() { @Test void testAbsoluteOrdering5() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); @@ -161,7 +160,7 @@ void testAbsoluteOrdering5() { List fragmentNames = Arrays.asList("a", "b", "c", "d", "e"); Collections.shuffle(fragmentNames); - manager.setWebFragments(fragmentNames.stream().map(InternalWebXmlManagerTest::toWebFragment).toList()); + manager.setWebFragments(fragmentNames.stream().map(WebXmlManagerTest::toWebFragment).toList()); List orderedFragments = manager.getOrderedFragments(); assertEquals(5, orderedFragments.size()); @@ -174,7 +173,7 @@ void testAbsoluteOrdering5() { @Test void testRelativeOrdering() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); @@ -207,7 +206,7 @@ void testRelativeOrdering() { @Test void testRelativeOrdering2() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); @@ -246,7 +245,7 @@ void testRelativeOrdering2() { @Test void testRelativeOrdering3() { - InternalWebXmlManager manager = new InternalWebXmlManager(); + WebXmlManager manager = new WebXmlManager(); WebXml webXml = new WebXml(); manager.setWebXml(webXml); diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlParserTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlParserTest.java similarity index 92% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlParserTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlParserTest.java index 8da03562cc..08897820d2 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlParserTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlParserTest.java @@ -28,8 +28,6 @@ package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; -import cloud.piranha.extension.webxml.WebXml; -import cloud.piranha.extension.webxml.WebXmlServletMapping; import cloud.piranha.resource.impl.DirectoryResource; import java.io.File; import java.io.InputStream; @@ -41,11 +39,11 @@ import org.junit.jupiter.api.Test; /** - * The JUnit tests for the InternalWebXmlParser class. + * The JUnit tests for the WebXmlParser class. * * @author Manfred Riem (mriem@manorrock.com) */ -class InternalWebXmlParserTest { +class WebXmlParserTest { /** * Test parse method. @@ -57,7 +55,7 @@ void testParseWebXml() throws Exception { DefaultWebApplication webApplication = new DefaultWebApplication(); webApplication.addResource(new DirectoryResource(new File("src/test/webxml/parse"))); InputStream inputStream = webApplication.getResourceAsStream("WEB-INF/web.xml"); - InternalWebXmlParser parser = new InternalWebXmlParser(); + WebXmlParser parser = new WebXmlParser(); WebXml webXml = parser.parse(inputStream); assertFalse(webXml.getServlets().isEmpty()); assertEquals(2, webXml.getServlets().size()); @@ -82,7 +80,7 @@ void testParseWebXml2() throws Exception { DefaultWebApplication webApplication = new DefaultWebApplication(); webApplication.addResource(new DirectoryResource(new File("src/test/webxml/parse2"))); InputStream inputStream = webApplication.getResourceAsStream("WEB-INF/web.xml"); - InternalWebXmlParser parser = new InternalWebXmlParser(); + WebXmlParser parser = new WebXmlParser(); WebXml webXml = parser.parse(inputStream); assertFalse(webXml.getDenyUncoveredHttpMethods()); assertNotEquals("myServletContextName", webXml.getDisplayName()); @@ -100,7 +98,7 @@ void testParseWebXml3() throws Exception { DefaultWebApplication webApplication = new DefaultWebApplication(); webApplication.addResource(new DirectoryResource(new File("src/test/webxml/parse3"))); InputStream inputStream = webApplication.getResourceAsStream("WEB-INF/web.xml"); - InternalWebXmlParser parser = new InternalWebXmlParser(); + WebXmlParser parser = new WebXmlParser(); WebXml webXml = parser.parse(inputStream); assertEquals(2, webXml.getWelcomeFiles().size()); assertEquals("index.html", webXml.getWelcomeFiles().get(0)); @@ -117,7 +115,7 @@ void testParseWebXml4() throws Exception { DefaultWebApplication webApplication = new DefaultWebApplication(); webApplication.addResource(new DirectoryResource(new File("src/test/webxml/parse4"))); InputStream inputStream = webApplication.getResourceAsStream("WEB-INF/web.xml"); - InternalWebXmlParser parser = new InternalWebXmlParser(); + WebXmlParser parser = new WebXmlParser(); WebXml webXml = parser.parse(inputStream); assertEquals(1, webXml.getServlets().size()); String servletName = webXml.getServlets().get(0).getServletName(); diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlProcessorTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlProcessorTest.java similarity index 89% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlProcessorTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlProcessorTest.java index 94958d7aa8..eb64eaa172 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/InternalWebXmlProcessorTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WebXmlProcessorTest.java @@ -30,17 +30,15 @@ import cloud.piranha.core.api.SecurityManager; import cloud.piranha.core.api.WebApplication; import cloud.piranha.core.impl.DefaultWebApplication; -import cloud.piranha.extension.webxml.WebXml; -import cloud.piranha.extension.webxml.WebXmlSecurityConstraint; import static org.junit.jupiter.api.Assertions.assertFalse; import org.junit.jupiter.api.Test; /** - * The JUnit tests for the InternalWebXmlProcessor class. + * The JUnit tests for the WebXmlProcessor class. * * @author Manfred Riem (mriem@manorrock.com) */ -public class InternalWebXmlProcessorTest { +public class WebXmlProcessorTest { /** * Test process method. @@ -50,7 +48,7 @@ public void testProcessWithSecurityConstraints() { WebXml webXml = new WebXml(); webXml.getSecurityConstraints().add(new WebXmlSecurityConstraint()); WebApplication webApplication = new DefaultWebApplication(); - InternalWebXmlProcessor processor = new InternalWebXmlProcessor(); + WebXmlProcessor processor = new WebXmlProcessor(); processor.process(webXml, webApplication); SecurityManager securityManager = webApplication.getManager().getSecurityManager(); diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/WelcomeFileTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WelcomeFileTest.java similarity index 97% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/WelcomeFileTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WelcomeFileTest.java index 6e325c24dc..116dbeca20 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/WelcomeFileTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WelcomeFileTest.java @@ -25,9 +25,10 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.extension.welcomefile.internal.InternalWelcomeFileManager; import cloud.piranha.resource.impl.DirectoryResource; import java.io.File; diff --git a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/WithoutLeadingSlashTest.java b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WithoutLeadingSlashTest.java similarity index 96% rename from extension/webxml/src/test/java/cloud/piranha/extension/webxml/WithoutLeadingSlashTest.java rename to extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WithoutLeadingSlashTest.java index 175091950e..e39ade5fb3 100644 --- a/extension/webxml/src/test/java/cloud/piranha/extension/webxml/WithoutLeadingSlashTest.java +++ b/extension/webxml/src/test/java/cloud/piranha/extension/webxml/internal/WithoutLeadingSlashTest.java @@ -25,11 +25,12 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -package cloud.piranha.extension.webxml; +package cloud.piranha.extension.webxml.internal; import cloud.piranha.core.impl.DefaultWebApplication; import cloud.piranha.core.impl.DefaultWebApplicationRequest; import cloud.piranha.core.impl.DefaultWebApplicationResponse; +import cloud.piranha.extension.webxml.WebXmlInitializer; import cloud.piranha.resource.impl.DirectoryResource; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/extension/webxml/src/test/webxml/withoutLeadingSlash1/WEB-INF/web.xml b/extension/webxml/src/test/webxml/withoutLeadingSlash1/WEB-INF/web.xml index e07e3fe987..aa21827506 100644 --- a/extension/webxml/src/test/webxml/withoutLeadingSlash1/WEB-INF/web.xml +++ b/extension/webxml/src/test/webxml/withoutLeadingSlash1/WEB-INF/web.xml @@ -3,7 +3,7 @@ TestServlet - cloud.piranha.extension.webxml.TestWithoutLeadingSlashServlet + cloud.piranha.extension.webxml.internal.TestWithoutLeadingSlashServlet TestServlet