Original package is {@code org.osgi.service.http}. There's no new equivalen of this package and users - * are encouraged to move to Jakarta Servlet Specificaiton (formerly known as - * Whiteboard specification).
+ * are encouraged to move to Whiteboard Specification for Jakarta™ Servlet. */ package org.ops4j.pax.web.service.http; diff --git a/pax-web-api/src/main/java/org/ops4j/pax/web/service/whiteboard/WebSocketMapping.java b/pax-web-api/src/main/java/org/ops4j/pax/web/service/whiteboard/WebSocketMapping.java index d890819bb5..edf40a1255 100644 --- a/pax-web-api/src/main/java/org/ops4j/pax/web/service/whiteboard/WebSocketMapping.java +++ b/pax-web-api/src/main/java/org/ops4j/pax/web/service/whiteboard/WebSocketMapping.java @@ -23,22 +23,22 @@ *On purpose, we don't allow registration of other objects that usually can be passed (by means of * {@link jakarta.servlet.annotation.HandlesTypes} annotation on a {@link jakarta.servlet.ServletContainerInitializer} * related to WebSockets) by users. Only annontated classes or actual instances are handled and we don't support:
Pax Web extends original initializer, so it is possible to override the {@link TldScanner}.
* - *This initializer is declared in {@code /META-INF/services/javax.servlet.ServletContainerInitializer} + *
This initializer is declared in {@code /META-INF/services/jakarta.servlet.ServletContainerInitializer} * for pax-web-extender-war purpose. For Whiteboard and HttpService purposes, it is used directly to configure the * context(s) when JSP support is required.
* @@ -48,9 +48,9 @@ * there is not many details about how exactly JSPs (and TLDs) should be supported. * *So we start with the asumption that CMPN 128 specification is about supporting WARs in OSGi runtime in very - * similar way to how they work in JavaEE environments. The most important common ground is how to use + * similar way to how they work in JakartaEE environments. The most important common ground is how to use * classloaders to find necessary resources. Details of how TLDs should be located are described inline below. Here's - * the outline: in JavaEE, WAR is associated with single classloader, which includes:
At some point during evolution of Servlet/JSP API specifications, the Servlet container was freed from the * responsibility of being "JSP container" and the interoperation was delegated to the mechanism of - * {@link javax.servlet.ServletContainerInitializer}s (SCIs). This package contains one such SCI that prepares + * {@link jakarta.servlet.ServletContainerInitializer}s (SCIs). This package contains one such SCI that prepares * the context (and in Pax Web it is specialized OSGi context) to allow usage of JSPs. The most * important thing is support for discovering TLD descriptors.
* diff --git a/pax-web-jsp/src/main/resources/META-INF/services/javax.el.ExpressionFactory b/pax-web-jsp/src/main/resources/META-INF/services/javax.el.ExpressionFactory index e877165bf6..db4c65ecef 100644 --- a/pax-web-jsp/src/main/resources/META-INF/services/javax.el.ExpressionFactory +++ b/pax-web-jsp/src/main/resources/META-INF/services/javax.el.ExpressionFactory @@ -18,5 +18,5 @@ org.apache.el.ExpressionFactoryImpl # The service-imp-first in this file is because it's required by jakarta.el:jakarta.el-api:3.0.3 and we treat # it as _canonical_ EL API Jar -# Its javax.el.FactoryFinder class reads only the first line of this file... +# Its jakarta.el.FactoryFinder class reads only the first line of this file... # org.apache.tomcat:tomcat-el skips the comments correctly because it's using generic java.util.ServiceLoader API diff --git a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/ElTest.java b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/ElTest.java index 1dd273e11d..8c7df6f6a2 100644 --- a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/ElTest.java +++ b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/ElTest.java @@ -16,21 +16,20 @@ */ package org.ops4j.pax.web.jsp; -import javax.el.ELContext; -import javax.el.ELManager; -import javax.el.ELProcessor; -import javax.el.ELResolver; -import javax.el.ExpressionFactory; -import javax.el.ValueExpression; - -import org.junit.Test; +import jakarta.el.ELContext; +import jakarta.el.ELManager; +import jakarta.el.ELProcessor; +import jakarta.el.ELResolver; +import jakarta.el.ExpressionFactory; +import jakarta.el.ValueExpression; + +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class ElTest { @@ -52,26 +51,26 @@ public void elApi() { // Provides an implementation for creating and evaluating EL expressions. ExpressionFactory expressionFactory = ExpressionFactory.newInstance(); - assertThat(expressionFactory.getClass().getName(), equalTo("org.apache.el.ExpressionFactoryImpl")); + assertThat(expressionFactory.getClass().getName()).isEqualTo("org.apache.el.ExpressionFactoryImpl"); manager.defineBean("model", new Model()); assertNotNull(processor.eval("model")); assertNull(processor.eval("model.prop")); processor.eval("model.prop = 'Grzegorz'"); - assertThat(processor.eval("model.prop"), equalTo("Grzegorz")); - assertThat(processor.eval("model.hello()"), equalTo("Grzegorz")); - assertThat(processor.eval("model.hello(\"Grzegorz\")"), equalTo("[Grzegorz]")); + assertThat((String) processor.eval("model.prop")).isEqualTo("Grzegorz"); + assertThat((String) processor.eval("model.hello()")).isEqualTo("Grzegorz"); + assertThat((String) processor.eval("model.hello(\"Grzegorz\")")).isEqualTo("[Grzegorz]"); Model m = (Model) resolver.getValue(context, null, "model"); assertNotNull(m); - assertThat(m.hello(), equalTo("Grzegorz")); + assertThat(m.hello()).isEqualTo("Grzegorz"); // immediate and deferred evaluation - not relevant in plain EL usage. It is relevant in JSP/JSF ValueExpression ve = expressionFactory.createValueExpression(context, "${model.prop}", String.class); - assertThat(ve.getValue(context), equalTo("Grzegorz")); + assertThat((String) ve.getValue(context)).isEqualTo("Grzegorz"); ve = expressionFactory.createValueExpression(context, "#{model.prop}", String.class); - assertThat(ve.getValue(context), equalTo("Grzegorz")); + assertThat((String) ve.getValue(context)).isEqualTo("Grzegorz"); } public static class Model { diff --git a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/JasperJspNoScriptingTest.java b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/JasperJspNoScriptingTest.java index 9a4d67c317..49c452c343 100644 --- a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/JasperJspNoScriptingTest.java +++ b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/JasperJspNoScriptingTest.java @@ -20,17 +20,17 @@ import java.lang.reflect.Constructor; import java.util.Collection; import java.util.Collections; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.descriptor.JspConfigDescriptor; -import javax.servlet.descriptor.JspPropertyGroupDescriptor; -import javax.servlet.descriptor.TaglibDescriptor; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.descriptor.JspPropertyGroupDescriptor; +import jakarta.servlet.descriptor.TaglibDescriptor; +import jakarta.servlet.jsp.JspFactory; import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.FileSystemResourceLoader; @@ -39,10 +39,7 @@ import org.springframework.mock.web.MockServletConfig; import org.springframework.mock.web.MockServletContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; public class JasperJspNoScriptingTest { @@ -53,7 +50,7 @@ public class JasperJspNoScriptingTest { private Servlet jspServlet; private ServletContext context; - @BeforeClass + @BeforeAll public static void initStaticDirectly() throws Exception { JspFactory.setDefaultFactory(new org.apache.jasper.runtime.JspFactoryImpl()); @@ -62,7 +59,7 @@ public static void initStaticDirectly() throws Exception { FileUtils.cleanDirectory(scratchDir); } - @Before + @BeforeEach public void init() throws Exception { Class servletClass = Class.forName("org.apache.jasper.servlet.JspServlet"); Constructor c = servletClass.getConstructor(); @@ -140,6 +137,11 @@ public String getBuffer() { public String getErrorOnUndeclaredNamespace() { return "false"; } + + @Override + public String getErrorOnELNotFound() { + return "false"; + } }); } }; diff --git a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/JasperJspTest.java b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/JasperJspTest.java index d7be3ec0c4..5c729d1bb1 100644 --- a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/JasperJspTest.java +++ b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/JasperJspTest.java @@ -17,16 +17,16 @@ package org.ops4j.pax.web.jsp; import java.io.File; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.descriptor.JspConfigDescriptor; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.osgi.framework.Bundle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,9 +36,8 @@ import org.springframework.mock.web.MockServletConfig; import org.springframework.mock.web.MockServletContext; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JasperJspTest { @@ -50,7 +49,7 @@ public class JasperJspTest { private ServletContext context; private Bundle paxWebJsp; - @BeforeClass + @BeforeAll public static void initStaticDirectly() throws Exception { JspFactory.setDefaultFactory(new org.apache.jasper.runtime.JspFactoryImpl()); @@ -59,7 +58,7 @@ public static void initStaticDirectly() throws Exception { scratchDir.mkdirs(); } - @Before + @BeforeEach public void init() throws Exception { jspServlet = new org.apache.jasper.servlet.JspServlet(); @@ -92,7 +91,7 @@ public void simpleJspWithEl() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -109,7 +108,7 @@ public void jspWithElFunctions() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -124,7 +123,7 @@ public void jspWithScripts() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -140,7 +139,7 @@ public void jspWithPageInclude() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -156,7 +155,7 @@ public void jspWithTagFiles() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -167,7 +166,7 @@ public void jspWithTagFiles() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); response = res.getContentAsString(); log.info("Response: {}", response); diff --git a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/PaxWebJspNoScriptingTest.java b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/PaxWebJspNoScriptingTest.java index 86bbcc500c..53e572a794 100644 --- a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/PaxWebJspNoScriptingTest.java +++ b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/PaxWebJspNoScriptingTest.java @@ -20,17 +20,17 @@ import java.lang.reflect.Constructor; import java.util.Collection; import java.util.Collections; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.descriptor.JspConfigDescriptor; -import javax.servlet.descriptor.JspPropertyGroupDescriptor; -import javax.servlet.descriptor.TaglibDescriptor; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.descriptor.JspPropertyGroupDescriptor; +import jakarta.servlet.descriptor.TaglibDescriptor; +import jakarta.servlet.jsp.JspFactory; import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.ops4j.pax.web.service.PaxWebConstants; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -43,10 +43,7 @@ import org.springframework.mock.web.MockServletConfig; import org.springframework.mock.web.MockServletContext; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -59,7 +56,7 @@ public class PaxWebJspNoScriptingTest { private Servlet jspServlet; private ServletContext context; - @BeforeClass + @BeforeAll public static void initStaticDirectly() throws Exception { JspFactory.setDefaultFactory(new org.apache.jasper.runtime.JspFactoryImpl()); @@ -68,7 +65,7 @@ public static void initStaticDirectly() throws Exception { FileUtils.cleanDirectory(scratchDir); } - @Before + @BeforeEach public void init() throws Exception { Class servletClass = Class.forName("org.apache.jasper.servlet.JspServlet"); Constructor c = servletClass.getConstructor(); @@ -146,6 +143,11 @@ public String getBuffer() { public String getErrorOnUndeclaredNamespace() { return "false"; } + + @Override + public String getErrorOnELNotFound() { + return "false"; + } }); } }; diff --git a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/PaxWebJspTest.java b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/PaxWebJspTest.java index 5faf780a7b..9474bc7941 100644 --- a/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/PaxWebJspTest.java +++ b/pax-web-jsp/src/test/java/org/ops4j/pax/web/jsp/PaxWebJspTest.java @@ -17,16 +17,16 @@ package org.ops4j.pax.web.jsp; import java.io.File; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.descriptor.JspConfigDescriptor; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspFactory; import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.ops4j.pax.web.service.PaxWebConstants; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -39,9 +39,8 @@ import org.springframework.mock.web.MockServletConfig; import org.springframework.mock.web.MockServletContext; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -55,7 +54,7 @@ public class PaxWebJspTest { private ServletContext context; private Bundle paxWebJsp; - @BeforeClass + @BeforeAll public static void initStaticDirectly() throws Exception { JspFactory.setDefaultFactory(new org.apache.jasper.runtime.JspFactoryImpl()); @@ -64,7 +63,7 @@ public static void initStaticDirectly() throws Exception { scratchDir.mkdirs(); } - @Before + @BeforeEach public void init() throws Exception { jspServlet = new org.apache.jasper.servlet.JspServlet(); @@ -105,7 +104,7 @@ public void simpleJspWithEl() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -122,7 +121,7 @@ public void jspWithElFunctions() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -137,7 +136,7 @@ public void jspWithScripts() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -153,7 +152,7 @@ public void jspWithPageInclude() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -169,7 +168,7 @@ public void jspWithTagFiles() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); String response = res.getContentAsString(); log.info("Response: {}", response); @@ -180,7 +179,7 @@ public void jspWithTagFiles() throws Exception { jspServlet.service(req, res); - assertThat(res.getStatus(), equalTo(HttpServletResponse.SC_OK)); + assertThat(res.getStatus()).isEqualTo(HttpServletResponse.SC_OK); response = res.getContentAsString(); log.info("Response: {}", response); diff --git a/pax-web-spi/pom.xml b/pax-web-spi/pom.xml index 04a077139a..72cce919af 100644 --- a/pax-web-spi/pom.xml +++ b/pax-web-spi/pom.xml @@ -249,6 +249,11 @@