diff --git a/debug/pom.xml b/debug/pom.xml index ae4103a5ff..f79c4f7633 100644 --- a/debug/pom.xml +++ b/debug/pom.xml @@ -88,12 +88,6 @@ ${project.version} compile - - cloud.piranha.extension - piranha-extension-compat-tomcat10x - ${project.version} - compile - cloud.piranha.extension piranha-extension-concurro diff --git a/extension/compat-tomcat10x/pom.xml b/extension/compat-tomcat10x/pom.xml deleted file mode 100644 index 9b9ad91336..0000000000 --- a/extension/compat-tomcat10x/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - 4.0.0 - - - cloud.piranha.extension - project - 25.2.0-SNAPSHOT - - - piranha-extension-compat-tomcat10x - jar - - Piranha - Extension - Tomcat 10.x Compatibility - - - - - cloud.piranha.core - piranha-core-api - ${project.version} - compile - - - - cloud.piranha.core - piranha-core-impl - ${project.version} - compile - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-params - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - - - - default - file:///tmp/piranha/extension/tomcat10x/ - - - diff --git a/extension/compat-tomcat10x/src/main/java/cloud/piranha/extension/tomcat10x/Tomcat10xExtension.java b/extension/compat-tomcat10x/src/main/java/cloud/piranha/extension/tomcat10x/Tomcat10xExtension.java deleted file mode 100644 index 9e210375b4..0000000000 --- a/extension/compat-tomcat10x/src/main/java/cloud/piranha/extension/tomcat10x/Tomcat10xExtension.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2002-2025 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.tomcat10x; - -import cloud.piranha.core.api.WebApplication; -import cloud.piranha.core.api.WebApplicationExtension; -import java.io.IOException; -import java.io.InputStream; -import static java.lang.System.Logger.Level.INFO; -import static java.lang.System.Logger.Level.WARNING; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.xml.sax.SAXException; - -/** - * The WebApplicationExtension that delivers Tomcat 10.x compatibility. - * - * @author Manfred Riem (mriem@manorrock.com) - */ -public class Tomcat10xExtension implements WebApplicationExtension { - - /** - * Defines the constant for enabling the extension. - */ - public static final String ENABLE_EXTENSION - = "cloud.piranha.extension.tomcat10x.Tomcat10xExtension.enable"; - - /** - * Stores the logger. - */ - private static final System.Logger LOGGER = System.getLogger(Tomcat10xExtension.class.getName()); - - @Override - public void configure(WebApplication webApplication) { - - boolean enable = Boolean.parseBoolean(System.getProperty(ENABLE_EXTENSION)); - - if (enable) { - InputStream inputStream = webApplication.getResourceAsStream("/META-INF/context.xml"); - if (inputStream != null) { - try { - DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document document = documentBuilder.parse(inputStream); - XPath xPath = XPathFactory.newInstance().newXPath(); - - String contextPath = xPath.evaluate("//Context/@path", (Node) document); - if (contextPath != null) { - LOGGER.log(WARNING, "Found Tomcat 10.x Context path, please replace with command-line parameter", this); - LOGGER.log(INFO, "Setting context path to: {0}", contextPath); - webApplication.setContextPath(contextPath); - } - - } catch (ParserConfigurationException | SAXException | IOException | XPathExpressionException e) { - } - } - } - } -} diff --git a/extension/compat-tomcat10x/src/main/java/module-info.java b/extension/compat-tomcat10x/src/main/java/module-info.java deleted file mode 100644 index 3c055a250d..0000000000 --- a/extension/compat-tomcat10x/src/main/java/module-info.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2002-2025 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. - */ - -/** - * This module delivers an extension to support Tomcat 10.x compatibility. - * - * @author Manfred Riem (mriem@manorrock.com) - */ -module cloud.piranha.extension.tomcat10x { - - exports cloud.piranha.extension.tomcat10x; - - opens cloud.piranha.extension.tomcat10x; - - requires cloud.piranha.core.api; - requires java.xml; -} diff --git a/extension/compat-tomcat10x/src/test/java/cloud/piranha/extension/tomcat10x/tests/Tomcat10xExtensionTest.java b/extension/compat-tomcat10x/src/test/java/cloud/piranha/extension/tomcat10x/tests/Tomcat10xExtensionTest.java deleted file mode 100644 index c20e28ac80..0000000000 --- a/extension/compat-tomcat10x/src/test/java/cloud/piranha/extension/tomcat10x/tests/Tomcat10xExtensionTest.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2002-2025 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.tomcat10x.tests; - -import cloud.piranha.core.impl.DefaultWebApplication; -import cloud.piranha.extension.tomcat10x.Tomcat10xExtension; -import cloud.piranha.resource.impl.DirectoryResource; -import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * The JUnit tests for the Tomcat10xExtension class. - * - * @author Manfred Riem (mriem@manorrock.com) - */ -public class Tomcat10xExtensionTest { - - /** - * Test of configure method. - */ - @Test - public void testConfigure() { - System.setProperty(Tomcat10xExtension.ENABLE_EXTENSION, "true"); - DefaultWebApplication webApplication = new DefaultWebApplication(); - webApplication.addResource(new DirectoryResource("src/test/tomcat/contextpath")); - Tomcat10xExtension extension = new Tomcat10xExtension(); - extension.configure(webApplication); - assertEquals("/mypath", webApplication.getContextPath()); - } -} diff --git a/extension/compat-tomcat10x/src/test/tomcat/contextpath/META-INF/context.xml b/extension/compat-tomcat10x/src/test/tomcat/contextpath/META-INF/context.xml deleted file mode 100644 index 423dfdec09..0000000000 --- a/extension/compat-tomcat10x/src/test/tomcat/contextpath/META-INF/context.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/extension/pom.xml b/extension/pom.xml index b13b3bcc61..47b48c7d7b 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -20,10 +20,9 @@ annotationscan-classfile angus bytesstreamhandler - compat-tomcat10x concurro coreprofile - declared + declared default-datasource eclipselink epicyro diff --git a/extension/servlet/pom.xml b/extension/servlet/pom.xml index 0761e281eb..51891dff1a 100644 --- a/extension/servlet/pom.xml +++ b/extension/servlet/pom.xml @@ -50,12 +50,6 @@ ${project.version} compile - - cloud.piranha.extension - piranha-extension-compat-tomcat10x - ${project.version} - compile - cloud.piranha.extension piranha-extension-expressly diff --git a/extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java b/extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java index 1d89c89695..65048fabcd 100644 --- a/extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java +++ b/extension/servlet/src/main/java/cloud/piranha/extension/servlet/ServletExtension.java @@ -40,7 +40,6 @@ import cloud.piranha.extension.security.servlet.ServletSecurityManagerExtension; import cloud.piranha.extension.servletannotations.ServletAnnotationsExtension; import cloud.piranha.extension.tempdir.TempDirExtension; -import cloud.piranha.extension.tomcat10x.Tomcat10xExtension; import cloud.piranha.extension.wasp.WaspExtension; import cloud.piranha.extension.wasp.WaspJspManagerExtension; import cloud.piranha.extension.webxml.WebXmlExtension; @@ -69,7 +68,6 @@ public void extend(WebApplicationExtensionContext context) { context.add(WaspExtension.class); // WaSP context.add(ServletContainerInitializerExtension.class); // ServletContainerInitializer context.add(ServletSecurityExtension.class); // Security implementation - context.add(Tomcat10xExtension.class); // Tomcat 10x compatbility } private static Class getAnnotationScanExtensionClass() { diff --git a/extension/servlet/src/main/java/module-info.java b/extension/servlet/src/main/java/module-info.java index 0b1fd94404..8f54373c32 100644 --- a/extension/servlet/src/main/java/module-info.java +++ b/extension/servlet/src/main/java/module-info.java @@ -57,7 +57,6 @@ requires cloud.piranha.extension.declared; requires cloud.piranha.extension.fileupload; requires cloud.piranha.extension.herring; - requires cloud.piranha.extension.tomcat10x; requires cloud.piranha.extension.expressly; requires cloud.piranha.extension.policy; requires cloud.piranha.extension.scinitializer;