diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 4bf0c98545..33788f9027 100644 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -143,12 +143,12 @@ javax.management.remote, javax.naming, org.w3c.dom, - javax.servlet;version="[2.5,4)", - javax.servlet.annotation;version="[2.5,4)", - javax.servlet.http;version="[2.5,4)", - javax.servlet.jsp, - javax.servlet.jsp.tagext, - javax.servlet.jsp.el, + jakarta.servlet;version="[5,6)", + jakarta.servlet.annotation;version="[5,6)", + jakarta.servlet.http;version="[5,6)", + jakarta.servlet.jsp, + jakarta.servlet.jsp.tagext, + jakarta.servlet.jsp.el, javax.management, javax.management.openmbean, javax.net, @@ -173,14 +173,14 @@ - - org.apache.tomcat - tomcat-servlet-api - provided + + jakarta.servlet + jakarta.servlet-api + provided - org.apache.tomcat - tomcat-websocket-api + jakarta.websocket + jakarta.websocket-api provided @@ -190,8 +190,8 @@ jakarta.jms-api - org.apache.geronimo.specs - geronimo-jta_1.1_spec + jakarta.transaction + jakarta.transaction-api org.apache.geronimo.specs @@ -238,6 +238,16 @@ xbean-spring + + org.springframework + spring-web + + + + org.springframework + spring-webmvc + + org.eclipse.jetty @@ -268,10 +278,24 @@ org.eclipse.jetty apache-jstl + 11.0.0 provided + + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 3.0.0 + provided + + + org.glassfish.web + jakarta.servlet.jsp.jstl + 3.0.1 + provided + + @@ -314,17 +339,17 @@ - - - org.apache.geronimo.specs - geronimo-annotation_1.3_spec + + + jakarta.annotation + jakarta.annotation-api - - org.ow2.asm - asm - provided - + + org.ow2.asm + asm + provided + org.osgi osgi.core diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java b/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java index 875492f6ac..e6791ea48a 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java @@ -23,10 +23,10 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; import org.springframework.web.context.support.XmlWebApplicationContext; -import javax.jms.ConnectionFactory; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.jms.ConnectionFactory; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; /** * Starts the WebConsole. @@ -68,6 +68,8 @@ public class WebConsoleStarter implements ServletContextListener { context.setConfigLocations(new String[] { configuration }); + + // [AMQ-9239] TODO: Confirm jakarta ServeletContext API usage change context.refresh(); context.start(); @@ -86,7 +88,7 @@ public class WebConsoleStarter implements ServletContextListener { XmlWebApplicationContext context = (XmlWebApplicationContext)WebApplicationContextUtils.getWebApplicationContext(event.getServletContext()); if (context != null) { context.stop(); - context.destroy(); + context.close(); } // do nothing, since the context is destroyed anyway } diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/config/OsgiConfiguration.java b/activemq-web-console/src/main/java/org/apache/activemq/web/config/OsgiConfiguration.java index 9b67be7f7b..8041e18d27 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/config/OsgiConfiguration.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/config/OsgiConfiguration.java @@ -23,7 +23,7 @@ import org.osgi.framework.ServiceRegistration; import org.osgi.service.cm.ConfigurationException; import org.osgi.service.cm.ManagedService; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import javax.management.remote.JMXServiceURL; import java.util.Collection; import java.util.Dictionary; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java index 178eadd998..958e2b3f4d 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.activemq.web.BrokerFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java index d3e115f793..b033665375 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.web.BrokerFacade; import org.apache.activemq.web.DestinationFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java index 9081f30bf1..80ec856c88 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.web.BrokerFacade; import org.apache.activemq.web.DurableSubscriberFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java index af3fbce8bc..945edfc5a5 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.web.BrokerFacade; import org.apache.activemq.web.DestinationFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java index 93318402ce..04bfbb22f7 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.broker.jmx.JobSchedulerViewMBean; import org.apache.activemq.web.BrokerFacade; import org.apache.activemq.web.DestinationFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java index d9bf009be2..6ffc249760 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.activemq.web.BrokerFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java index 460a7806e1..d54b012341 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.web.BrokerFacade; import org.apache.activemq.web.DurableSubscriberFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java index 5a4916580b..e5e3487d20 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.activemq.web.BrokerFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PauseDestination.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PauseDestination.java index fd1c0893af..0f3876332c 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PauseDestination.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PauseDestination.java @@ -21,8 +21,8 @@ import org.apache.activemq.web.DestinationFacade; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java index 1921b0c024..0b6da64bf8 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web.controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.web.BrokerFacade; import org.apache.activemq.web.DestinationFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/ResumeDestination.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/ResumeDestination.java index 9009557acf..8eacee72eb 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/ResumeDestination.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/ResumeDestination.java @@ -21,8 +21,8 @@ import org.apache.activemq.web.DestinationFacade; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/RetryMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/RetryMessage.java index 8610d2005d..0cbeec1313 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/RetryMessage.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/RetryMessage.java @@ -24,8 +24,8 @@ import org.slf4j.LoggerFactory; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.Controller; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Retry a message on a queue. diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java index 4b05bb6bf7..2c61097b0e 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java @@ -18,10 +18,10 @@ package org.apache.activemq.web.controller; import java.util.Iterator; import java.util.Map; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.web.BrokerFacade; import org.apache.activemq.web.DestinationFacade; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java b/activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java index ca6f27cb51..a82e9f4a98 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java @@ -22,15 +22,15 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.web.BrokerFacade; import org.slf4j.Logger; diff --git a/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java b/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java index f000607ade..9f8caf4bfb 100644 --- a/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java +++ b/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java @@ -18,7 +18,7 @@ package org.apache.activemq.web.handler; import java.util.Arrays; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.activemq.web.DestinationFacade; import org.slf4j.Logger; diff --git a/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf b/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf index 9896410ee6..6ba1a7a722 100644 --- a/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf +++ b/activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf @@ -16,5 +16,5 @@ --%> <%@ taglib prefix="form" tagdir="/WEB-INF/tags/form" %> <%@ taglib prefix="jms" tagdir="/WEB-INF/tags/jms" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="c" uri="jakarta.tags.core" %> +<%@ taglib prefix="fn" uri="jakarta.tags.functions"%> diff --git a/activemq-web-console/src/main/webapp/WEB-INF/tags/jms/forEachMessage.tag b/activemq-web-console/src/main/webapp/WEB-INF/tags/jms/forEachMessage.tag index 6dae9dbc65..3f2f390a09 100644 --- a/activemq-web-console/src/main/webapp/WEB-INF/tags/jms/forEachMessage.tag +++ b/activemq-web-console/src/main/webapp/WEB-INF/tags/jms/forEachMessage.tag @@ -15,9 +15,9 @@ limitations under the License. --%> <%@ attribute name="var" type="java.lang.String" required="true" %> -<%@ attribute name="queueBrowser" type="javax.jms.QueueBrowser" required="true" %> +<%@ attribute name="queueBrowser" type="jakarta.jms.QueueBrowser" required="true" %> <%@ tag import="java.util.Enumeration" %> -<%@ tag import="javax.jms.Message" %> +<%@ tag import="jakarta.jms.Message" %> <% Enumeration iter = queueBrowser.getEnumeration(); diff --git a/activemq-web-console/src/main/webapp/WEB-INF/tags/jms/persistent.tag b/activemq-web-console/src/main/webapp/WEB-INF/tags/jms/persistent.tag index f7f33a6277..4fc2aaed8c 100644 --- a/activemq-web-console/src/main/webapp/WEB-INF/tags/jms/persistent.tag +++ b/activemq-web-console/src/main/webapp/WEB-INF/tags/jms/persistent.tag @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and limitations under the License. --%> -<%@ attribute name="message" type="javax.jms.Message" required="true" %> +<%@ attribute name="message" type="jakarta.jms.Message" required="true" %> <% if (message != null) { - if (message.getJMSDeliveryMode() == javax.jms.DeliveryMode.PERSISTENT) { + if (message.getJMSDeliveryMode() == jakarta.jms.DeliveryMode.PERSISTENT) { out.println("Persistent"); } else { diff --git a/activemq-web-console/src/main/webapp/WEB-INF/web.xml b/activemq-web-console/src/main/webapp/WEB-INF/web.xml index 9672c84f1d..538310ea88 100644 --- a/activemq-web-console/src/main/webapp/WEB-INF/web.xml +++ b/activemq-web-console/src/main/webapp/WEB-INF/web.xml @@ -16,10 +16,11 @@ limitations under the License. --> - + Apache ActiveMQ Web Console @@ -111,7 +112,7 @@ diff --git a/activemq-web-demo/src/main/webapp/META-INF/NOTICE b/activemq-web-demo/src/main/webapp/META-INF/NOTICE index 5436772405..171b4dcfee 100644 --- a/activemq-web-demo/src/main/webapp/META-INF/NOTICE +++ b/activemq-web-demo/src/main/webapp/META-INF/NOTICE @@ -61,7 +61,7 @@ This product includes software developed by the Sun Microsystems, Inc. This product includes some software developed at The Apache Software Foundation (http://www.apache.org/). -The javax.servlet package used by Jetty is copyright +The jakarta.servlet package used by Jetty is copyright Sun Microsystems, Inc and Apache Software Foundation. It is distributed under the Common Development and Distribution License. You can obtain a copy of the license at diff --git a/activemq-web-demo/src/main/webapp/WEB-INF/web.xml b/activemq-web-demo/src/main/webapp/WEB-INF/web.xml index cd39366125..98ff819917 100644 --- a/activemq-web-demo/src/main/webapp/WEB-INF/web.xml +++ b/activemq-web-demo/src/main/webapp/WEB-INF/web.xml @@ -15,10 +15,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - + Apache ActiveMQ Web Demo diff --git a/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java b/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java index 8041e70549..32bdca6815 100644 --- a/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java +++ b/activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java @@ -26,8 +26,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.Message; -import javax.jms.MessageProducer; +import jakarta.jms.Message; +import jakarta.jms.MessageProducer; import org.apache.activemq.transport.stomp.Stomp; import org.apache.activemq.transport.stomp.StompConnection; diff --git a/activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java b/activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java index 3f95f8d4ea..59e957b595 100644 --- a/activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java +++ b/activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java @@ -24,9 +24,9 @@ import java.net.Socket; import java.net.URI; import java.net.URL; -import javax.jms.Connection; -import javax.jms.MessageProducer; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; import javax.net.ServerSocketFactory; import javax.net.SocketFactory; diff --git a/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java b/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java index 9319601e90..9cfd9cc7a1 100644 --- a/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java +++ b/activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.TextMessage; +import jakarta.jms.TextMessage; import javax.management.ObjectName; import org.apache.commons.lang3.RandomStringUtils; @@ -268,7 +268,8 @@ public class RestTest extends JettyTestSupport { final CountDownLatch latch2 = new CountDownLatch(1); final StringBuffer buf2 = new StringBuffer(); final AtomicInteger status2 = new AtomicInteger(); - final HttpFields responseFields = new HttpFields(); + + final HttpFields.Mutable responseFields = HttpFields.build(); httpClient.newRequest("http://localhost:" + port + "/message/testPost?readTimeout=1000&type=Queue") .method(HttpMethod.GET).send(new BufferingResponseListener() { @Override @@ -285,7 +286,7 @@ public class RestTest extends JettyTestSupport { HttpFields fields = responseFields; assertNotNull("Headers Exist", fields); - assertEquals("header value", "value", fields.getStringField("property")); + assertEquals("header value", "value", fields.getField("property").getValue()); } diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml index f05498f9ab..da822f98dc 100644 --- a/activemq-web/pom.xml +++ b/activemq-web/pom.xml @@ -76,11 +76,11 @@ - - org.apache.tomcat - tomcat-servlet-api + + jakarta.servlet + jakarta.servlet-api provided - + org.eclipse.jetty jetty-server @@ -92,7 +92,7 @@ org.eclipse.jetty.websocket - websocket-server + websocket-jetty-server diff --git a/activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java b/activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java index 3a149f3bfd..68a4034e53 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java @@ -17,8 +17,10 @@ package org.apache.activemq.web; import java.util.LinkedList; -import javax.jms.Message; -import javax.jms.MessageConsumer; + +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; + import org.apache.activemq.MessageAvailableListener; import org.apache.activemq.web.async.AsyncServletRequest; import org.slf4j.Logger; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/AjaxServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/AjaxServlet.java index 80f9c3c355..622a0ba6d4 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/AjaxServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/AjaxServlet.java @@ -21,9 +21,9 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /* ------------------------------------------------------------ */ /** diff --git a/activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java b/activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java index 62a022cc4a..e61b7da846 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Date; -import javax.jms.MessageConsumer; -import javax.servlet.http.HttpServletRequest; +import jakarta.jms.MessageConsumer; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java b/activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java index 0b37341374..89c6e6b9fb 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java @@ -21,8 +21,8 @@ import org.apache.activemq.broker.util.AuditLogService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; public class AuditFilter implements Filter { diff --git a/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java b/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java index 367f11017c..ac00500ddb 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.web; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.activemq.broker.jmx.BrokerViewMBean; import org.apache.activemq.broker.jmx.QueueViewMBean; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java index c3ecd7f7ac..e19cf27e11 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java @@ -26,17 +26,19 @@ import java.util.List; import java.util.Map; import java.util.Timer; import java.util.TimerTask; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.ObjectMessage; -import javax.jms.TextMessage; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; + +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.TextMessage; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; + import org.apache.activemq.MessageAvailableConsumer; import org.apache.activemq.web.async.AsyncServletRequest; import org.slf4j.Logger; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java index 3ccad48627..e9daf59df6 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java @@ -16,14 +16,14 @@ */ package org.apache.activemq.web; -import javax.jms.BytesMessage; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.ObjectMessage; -import javax.jms.QueueBrowser; -import javax.jms.StreamMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.ObjectMessage; +import jakarta.jms.QueueBrowser; +import jakarta.jms.StreamMessage; +import jakarta.jms.TextMessage; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java index b40b50f22f..89b9bd7e1f 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java @@ -17,22 +17,17 @@ package org.apache.activemq.web; +import jakarta.jms.*; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Enumeration; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.ObjectMessage; -import javax.jms.TextMessage; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import org.apache.activemq.MessageAvailableConsumer; import org.apache.activemq.MessageAvailableListener; import org.apache.activemq.web.async.AsyncServletRequest; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java b/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java index 5a2771b006..f4f4406e37 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java @@ -24,13 +24,13 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.TextMessage; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.TextMessage; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQQueue; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java b/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java index fa3e202317..d7f7e9afb0 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.web; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; /** * Exception thrown if there was no destination available diff --git a/activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java b/activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java index cc9d8fff3e..b973136751 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.web; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; /** * diff --git a/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java index 6ad9f011a3..168bf7d506 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java @@ -21,13 +21,13 @@ import java.io.PrintWriter; import java.util.Hashtable; import java.util.Map; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Session; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.Session; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * A servlet which will publish dummy market data prices diff --git a/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java b/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java index db93654b83..a8ad6ba369 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java @@ -20,10 +20,10 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.Session; +import jakarta.jms.JMSException; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.Session; /** * diff --git a/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java b/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java index c43e538837..7215ddd1b5 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java @@ -22,15 +22,15 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.Session; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.Session; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.activemq.util.FactoryFinder; import org.apache.activemq.util.IntrospectionSupport; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/QueueConsumerQuery.java b/activemq-web/src/main/java/org/apache/activemq/web/QueueConsumerQuery.java index c5a21b9578..ae744c4c13 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/QueueConsumerQuery.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/QueueConsumerQuery.java @@ -18,7 +18,7 @@ package org.apache.activemq.web; import java.util.Collection; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.broker.jmx.SubscriptionViewMBean; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/QueueProducerQuery.java b/activemq-web/src/main/java/org/apache/activemq/web/QueueProducerQuery.java index b5ca8c9dc2..4137ca12b2 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/QueueProducerQuery.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/QueueProducerQuery.java @@ -18,7 +18,7 @@ package org.apache.activemq.web; import java.util.Collection; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.broker.jmx.ProducerViewMBean; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java b/activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java index 9a69883688..e421bed125 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java @@ -20,14 +20,14 @@ package org.apache.activemq.web; import java.io.IOException; import java.util.UUID; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; /* ------------------------------------------------------------ */ /** diff --git a/activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java b/activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java index 1c04e937f2..ebc2c4b06a 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java @@ -20,8 +20,8 @@ package org.apache.activemq.web; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; public class SessionListener implements HttpSessionListener { diff --git a/activemq-web/src/main/java/org/apache/activemq/web/SessionPool.java b/activemq-web/src/main/java/org/apache/activemq/web/SessionPool.java index 998fed9a9d..36d61877b8 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/SessionPool.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/SessionPool.java @@ -18,10 +18,10 @@ package org.apache.activemq.web; import java.util.LinkedList; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.JMSException; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.JMSException; +import jakarta.jms.Session; import org.apache.activemq.ActiveMQSession; import org.slf4j.Logger; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java b/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java index 04e1626302..545b2d0953 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java @@ -16,9 +16,9 @@ */ package org.apache.activemq.web; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.xbean.BrokerFactoryBean; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/TopicProducerQuery.java b/activemq-web/src/main/java/org/apache/activemq/web/TopicProducerQuery.java index e645c27e5b..ef375cb981 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/TopicProducerQuery.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/TopicProducerQuery.java @@ -18,7 +18,7 @@ package org.apache.activemq.web; import java.util.Collection; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.broker.jmx.ProducerViewMBean; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/TopicSubscriberQuery.java b/activemq-web/src/main/java/org/apache/activemq/web/TopicSubscriberQuery.java index f07df46915..cf48555708 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/TopicSubscriberQuery.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/TopicSubscriberQuery.java @@ -18,7 +18,7 @@ package org.apache.activemq.web; import java.util.Collection; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.broker.jmx.SubscriptionViewMBean; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/UndeliveredAjaxMessage.java b/activemq-web/src/main/java/org/apache/activemq/web/UndeliveredAjaxMessage.java index 8320e9e4f4..14f89c9e7e 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/UndeliveredAjaxMessage.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/UndeliveredAjaxMessage.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.web; -import javax.jms.Message; -import javax.jms.MessageConsumer; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; class UndeliveredAjaxMessage { private Message message; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java b/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java index c04df936c8..cbf8ecf7bc 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/WebClient.java @@ -28,22 +28,22 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Semaphore; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionActivationListener; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionBindingListener; -import javax.servlet.http.HttpSessionEvent; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionActivationListener; +import jakarta.servlet.http.HttpSessionBindingEvent; +import jakarta.servlet.http.HttpSessionBindingListener; +import jakarta.servlet.http.HttpSessionEvent; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.MessageAvailableConsumer; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/async/AsyncServletRequest.java b/activemq-web/src/main/java/org/apache/activemq/web/async/AsyncServletRequest.java index 79aa3fb06f..dbdb61b70f 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/async/AsyncServletRequest.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/async/AsyncServletRequest.java @@ -21,12 +21,12 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import javax.servlet.AsyncContext; -import javax.servlet.AsyncEvent; -import javax.servlet.AsyncListener; -import javax.servlet.DispatcherType; -import javax.servlet.ServletRequest; -import javax.servlet.ServletRequestWrapper; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.AsyncEvent; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/config/AbstractConfiguration.java b/activemq-web/src/main/java/org/apache/activemq/web/config/AbstractConfiguration.java index f3d2d50a4e..462abe2b73 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/config/AbstractConfiguration.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/config/AbstractConfiguration.java @@ -20,7 +20,7 @@ import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Collection; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import javax.management.remote.JMXServiceURL; import org.apache.activemq.ActiveMQConnectionFactory; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/config/JNDIConfiguration.java b/activemq-web/src/main/java/org/apache/activemq/web/config/JNDIConfiguration.java index 12dd12243f..c2ed90611b 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/config/JNDIConfiguration.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/config/JNDIConfiguration.java @@ -18,7 +18,7 @@ package org.apache.activemq.web.config; import java.util.Collection; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import javax.management.remote.JMXServiceURL; import javax.naming.InitialContext; import javax.naming.NameNotFoundException; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/config/JspConfigurer.java b/activemq-web/src/main/java/org/apache/activemq/web/config/JspConfigurer.java index 9c60ab22e1..aecff8d59d 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/config/JspConfigurer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/config/JspConfigurer.java @@ -29,11 +29,11 @@ import org.eclipse.jetty.webapp.WebAppContext; public class JspConfigurer { public static void configureJetty(Server server, HandlerCollection collection) { - Configuration.ClassList classlist = Configuration.ClassList - .setServerDefault( server ); - classlist.addBefore( - "org.eclipse.jetty.webapp.JettyWebXmlConfiguration", - "org.eclipse.jetty.annotations.AnnotationConfiguration" ); +// Configuration.ClassList classlist = Configuration.ClassList +// .setServerDefault( server ); +// classlist.addBefore( +// "org.eclipse.jetty.webapp.JettyWebXmlConfiguration", +// "org.eclipse.jetty.annotations.AnnotationConfiguration" ); // Set the ContainerIncludeJarPattern so that jetty examines these // container-path jars for tlds, web-fragments etc. @@ -43,7 +43,7 @@ public class JspConfigurer { if (handler instanceof WebAppContext){ ((WebAppContext) handler).setAttribute( "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern", - ".*/[^/]*servlet-api-[^/]*\\.jar$|.*/javax.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$" ); + ".*/[^/]*servlet-api-[^/]*\\.jar$|.*/jakarta.servlet.jsp.jstl-.*\\.jar$|.*/[^/]*taglibs.*\\.jar$" ); } } } diff --git a/activemq-web/src/main/java/org/apache/activemq/web/config/SystemPropertiesConfiguration.java b/activemq-web/src/main/java/org/apache/activemq/web/config/SystemPropertiesConfiguration.java index 6166890f97..d68a495b1e 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/config/SystemPropertiesConfiguration.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/config/SystemPropertiesConfiguration.java @@ -18,7 +18,7 @@ package org.apache.activemq.web.config; import java.util.Collection; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import javax.management.remote.JMXServiceURL; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/config/WebConsoleConfiguration.java b/activemq-web/src/main/java/org/apache/activemq/web/config/WebConsoleConfiguration.java index 7c484450e3..6425efec1c 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/config/WebConsoleConfiguration.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/config/WebConsoleConfiguration.java @@ -18,7 +18,7 @@ package org.apache.activemq.web.config; import java.util.Collection; -import javax.jms.ConnectionFactory; +import jakarta.jms.ConnectionFactory; import javax.management.remote.JMXServiceURL; /** diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java index 0504a66524..6148df1469 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java @@ -20,12 +20,12 @@ package org.apache.activemq.web.view; import java.io.IOException; import java.io.PrintWriter; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.QueueBrowser; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.QueueBrowser; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * Represents a rendering of the messages diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java index 21b7a2e9f9..088a4c1926 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java @@ -21,13 +21,13 @@ import java.io.PrintWriter; import java.util.Date; import java.util.List; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.QueueBrowser; -import javax.jms.TextMessage; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.QueueBrowser; +import jakarta.jms.TextMessage; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.rometools.rome.feed.synd.SyndContent; import com.rometools.rome.feed.synd.SyndContentImpl; diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java index 35983aedc4..f8165d8849 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.Enumeration; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.QueueBrowser; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.QueueBrowser; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; /** * A simple rendering of the contents of a queue appear as a list of message diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java index bfa0a06fcd..46e2a0106e 100644 --- a/activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java +++ b/activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java @@ -18,11 +18,11 @@ package org.apache.activemq.web.view; import java.io.PrintWriter; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.QueueBrowser; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.QueueBrowser; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import com.thoughtworks.xstream.XStream;