diff --git a/debug/pom.xml b/debug/pom.xml index d566c631bb..ae4103a5ff 100644 --- a/debug/pom.xml +++ b/debug/pom.xml @@ -88,12 +88,6 @@ ${project.version} compile - - cloud.piranha.extension - piranha-extension-compat-glassfish7x - ${project.version} - compile - cloud.piranha.extension piranha-extension-compat-tomcat10x diff --git a/extension/compat-glassfish7x/pom.xml b/extension/compat-glassfish7x/pom.xml deleted file mode 100644 index 10c6dd3801..0000000000 --- a/extension/compat-glassfish7x/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - 4.0.0 - - - cloud.piranha.extension - project - 25.2.0-SNAPSHOT - - - piranha-extension-compat-glassfish7x - jar - - Piranha - Extension - Glassfish 7.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/glassfish7x/ - - - - diff --git a/extension/compat-glassfish7x/src/main/java/cloud/piranha/extension/glassfish7x/Glassfish7xExtension.java b/extension/compat-glassfish7x/src/main/java/cloud/piranha/extension/glassfish7x/Glassfish7xExtension.java deleted file mode 100644 index 05a6aedd22..0000000000 --- a/extension/compat-glassfish7x/src/main/java/cloud/piranha/extension/glassfish7x/Glassfish7xExtension.java +++ /dev/null @@ -1,82 +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.glassfish7x; - -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 Glassfish7xExtension implements WebApplicationExtension { - - /** - * Stores the logger. - */ - private static final System.Logger LOGGER = System.getLogger(Glassfish7xExtension.class.getName()); - - @Override - public void configure(WebApplication webApplication) { - - InputStream inputStream = webApplication.getResourceAsStream("/WEB-INF/glassfish-web.xml"); - if (inputStream != null) { - try { - DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document document = documentBuilder.parse(inputStream); - XPath xPath = XPathFactory.newInstance().newXPath(); - - String contextPath = xPath.evaluate("//glassfish-web-app/context-root/text()", (Node) document); - if (contextPath != null) { - contextPath = contextPath.trim(); - LOGGER.log(INFO, "Found Glassfish 7.x Context path: {0}", contextPath); - LOGGER.log(WARNING, "Found Glassfish 7.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) { - e.printStackTrace(); - } - } - } -} diff --git a/extension/compat-glassfish7x/src/main/java/module-info.java b/extension/compat-glassfish7x/src/main/java/module-info.java deleted file mode 100644 index 2bfae2242a..0000000000 --- a/extension/compat-glassfish7x/src/main/java/module-info.java +++ /dev/null @@ -1,40 +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 Glassfish 7.x compatibility. - * - * @author Manfred Riem (mriem@manorrock.com) - */ -module cloud.piranha.extension.glassfish7x { - - exports cloud.piranha.extension.glassfish7x; - opens cloud.piranha.extension.glassfish7x; - requires cloud.piranha.core.api; - requires java.xml; -} diff --git a/extension/compat-glassfish7x/src/test/glassfish/contextpath/WEB-INF/glassfish-web.xml b/extension/compat-glassfish7x/src/test/glassfish/contextpath/WEB-INF/glassfish-web.xml deleted file mode 100644 index 02c24b20c5..0000000000 --- a/extension/compat-glassfish7x/src/test/glassfish/contextpath/WEB-INF/glassfish-web.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - /mypath - diff --git a/extension/compat-glassfish7x/src/test/java/cloud/piranha/extension/glassfish7x/tests/Glassfish7xExtensionTest.java b/extension/compat-glassfish7x/src/test/java/cloud/piranha/extension/glassfish7x/tests/Glassfish7xExtensionTest.java deleted file mode 100644 index 028d97df7a..0000000000 --- a/extension/compat-glassfish7x/src/test/java/cloud/piranha/extension/glassfish7x/tests/Glassfish7xExtensionTest.java +++ /dev/null @@ -1,54 +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.glassfish7x.tests; - -import cloud.piranha.core.impl.DefaultWebApplication; -import cloud.piranha.extension.glassfish7x.Glassfish7xExtension; -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 Glassfish7xExtensionTest { - - /** - * Test of configure method, of class Tomcat10xExtension. - */ - @Test - public void testConfigure() { - DefaultWebApplication webApplication = new DefaultWebApplication(); - webApplication.addResource(new DirectoryResource("src/test/glassfish/contextpath")); - Glassfish7xExtension extension = new Glassfish7xExtension(); - extension.configure(webApplication); - assertEquals("/mypath", webApplication.getContextPath()); - } -} diff --git a/extension/pom.xml b/extension/pom.xml index b6ec8e66a6..b13b3bcc61 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -20,7 +20,6 @@ annotationscan-classfile angus bytesstreamhandler - compat-glassfish7x compat-tomcat10x concurro coreprofile diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml index a7921bd7ca..61ad7f1084 100644 --- a/extension/webprofile/pom.xml +++ b/extension/webprofile/pom.xml @@ -50,12 +50,6 @@ ${project.version} compile - - cloud.piranha.extension - piranha-extension-compat-glassfish7x - ${project.version} - compile - cloud.piranha.extension piranha-extension-default-datasource diff --git a/extension/webprofile/src/main/java/cloud/piranha/extension/webprofile/WebProfileExtension.java b/extension/webprofile/src/main/java/cloud/piranha/extension/webprofile/WebProfileExtension.java index 7a9dd63048..fd95adf603 100644 --- a/extension/webprofile/src/main/java/cloud/piranha/extension/webprofile/WebProfileExtension.java +++ b/extension/webprofile/src/main/java/cloud/piranha/extension/webprofile/WebProfileExtension.java @@ -35,7 +35,6 @@ import cloud.piranha.extension.declared.DeclaredExtension; import cloud.piranha.extension.eclipselink.EclipseLinkExtension; import cloud.piranha.extension.fileupload.FileUploadExtension; -import cloud.piranha.extension.glassfish7x.Glassfish7xExtension; import cloud.piranha.extension.herring.HerringExtension; import cloud.piranha.extension.policy.PolicyExtension; import cloud.piranha.extension.scinitializer.ServletContainerInitializerExtension; @@ -77,7 +76,6 @@ public void extend(WebApplicationExtensionContext context) { context.add(WaspExtension.class); // WaSP context.add(EclipseLinkExtension.class); // Jakarta Persistence context.add(ServletContainerInitializerExtension.class); // ServletContainerInitializer - context.add(Glassfish7xExtension.class); // Glassfish 7.x compatbility } private static Class getAnnotationScanExtensionClass() { diff --git a/extension/webprofile/src/main/java/module-info.java b/extension/webprofile/src/main/java/module-info.java index c60c719776..6febf4af0c 100644 --- a/extension/webprofile/src/main/java/module-info.java +++ b/extension/webprofile/src/main/java/module-info.java @@ -63,7 +63,6 @@ requires cloud.piranha.extension.expressly; requires cloud.piranha.extension.datasource; requires cloud.piranha.extension.eclipselink; - requires cloud.piranha.extension.glassfish7x; requires cloud.piranha.extension.herring; requires cloud.piranha.extension.jersey; requires cloud.piranha.extension.policy;