Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-9239] jakarta.jms - activemq-web-console, activemq-web-demo, activemq-web changes

This commit is contained in:
Matt Pavlovich 2023-04-13 09:21:41 -05:00
parent 65267a9a15
commit 90fbd9098b
63 changed files with 285 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
activemq-web-console/pom.xml
View File

@ -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 @@
</build>
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-websocket-api</artifactId>
<groupId>jakarta.websocket</groupId>
<artifactId>jakarta.websocket-api</artifactId>
<scope>provided</scope>
</dependency>
@ -190,8 +190,8 @@
<artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@ -238,6 +238,16 @@
<artifactId>xbean-spring</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<!-- web container -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
@ -268,10 +278,24 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jstl</artifactId>
<version>11.0.0</version>
<scope>provided</scope>
</dependency>
<!-- Tag Libs -->
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<version>3.0.1</version>
<scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId>
@ -282,6 +306,7 @@
<artifactId>taglibs-standard-impl</artifactId>
<scope>provided</scope>
</dependency>
-->
<!-- used for testing -->
<dependency>
@ -314,17 +339,17 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.3_spec</artifactId>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>

12
activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java
View File

@ -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
}

2
activemq-web-console/src/main/java/org/apache/activemq/web/config/OsgiConfiguration.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/CopyMessage.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateDestination.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/CreateSubscriber.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteDestination.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteJob.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteMessage.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/DeleteSubscriber.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/MoveMessage.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/PauseDestination.java
View File

@ -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;
/**
*

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/PurgeDestination.java
View File

@ -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;

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/ResumeDestination.java
View File

@ -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;
/**
*

4
activemq-web-console/src/main/java/org/apache/activemq/web/controller/RetryMessage.java
View File

@ -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.

8
activemq-web-console/src/main/java/org/apache/activemq/web/controller/SendMessage.java
View File

@ -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;

18
activemq-web-console/src/main/java/org/apache/activemq/web/filter/ApplicationContextFilter.java
View File

@ -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;

2
activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java
View File

@ -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;

4
activemq-web-console/src/main/webapp/WEB-INF/jspf/headertags.jspf
View File

@ -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"%>

4
activemq-web-console/src/main/webapp/WEB-INF/tags/jms/forEachMessage.tag
View File

@ -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();

4
activemq-web-console/src/main/webapp/WEB-INF/tags/jms/persistent.tag
View File

@ -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 {

11
activemq-web-console/src/main/webapp/WEB-INF/web.xml
View File

@ -16,10 +16,11 @@
limitations under the License.
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
web-app_5_0.xsd"
version="5.0">
<description>
Apache ActiveMQ Web Console
@ -111,7 +112,7 @@
<!-- JNDI Stuff
<resource-ref>
<res-ref-name>jms/connectionFactory</res-ref-name>
<res-type>javax.jms.ConnectionFactory</res-type>
<res-type>jakarta.jms.ConnectionFactory</res-type>
<res-auth>Container</res-auth>
</resource-ref>
<resource-ref>

21
activemq-web-demo/pom.xml
View File

@ -111,12 +111,12 @@
javax.management.remote,
javax.naming,
org.w3c.dom,
javax.servlet,
javax.servlet.http,
javax.servlet.resources,
javax.servlet.jsp,
javax.servlet.jsp.tagext,
javax.servlet.jsp.el,
jakarta.servlet,
jakarta.servlet.http,
jakarta.servlet.resources,
jakarta.servlet.jsp,
jakarta.servlet.jsp.tagext,
jakarta.servlet.jsp.el,
javax.management,
javax.management.openmbean,
javax.net,
@ -146,8 +146,8 @@
<artifactId>jakarta.jms-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@ -188,6 +188,11 @@
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<scope>test</scope>
</dependency>
<!-- for custom XML parsing -->
<dependency>

2
activemq-web-demo/src/main/webapp/META-INF/NOTICE
View File

@ -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

9
activemq-web-demo/src/main/webapp/WEB-INF/web.xml
View File

@ -15,10 +15,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
web-app_5_0.xsd"
version="5.0">
<display-name>Apache ActiveMQ Web Demo</display-name>

4
activemq-web-demo/src/test/java/org/apache/activemq/web/AjaxTest.java
View File

@ -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;

6
activemq-web-demo/src/test/java/org/apache/activemq/web/JettyTestSupport.java
View File

@ -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;

7
activemq-web-demo/src/test/java/org/apache/activemq/web/RestTest.java
View File

@ -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());
}

10
activemq-web/pom.xml
View File

@ -76,11 +76,11 @@
</dependency>
<!-- web container -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@ -92,7 +92,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
<artifactId>websocket-jetty-server</artifactId>
</dependency>
<!-- Rome RSS Reader -->

6
activemq-web/src/main/java/org/apache/activemq/web/AjaxListener.java
View File

@ -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;

6
activemq-web/src/main/java/org/apache/activemq/web/AjaxServlet.java
View File

@ -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;
/* ------------------------------------------------------------ */
/**

4
activemq-web/src/main/java/org/apache/activemq/web/AjaxWebClient.java
View File

@ -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;

4
activemq-web/src/main/java/org/apache/activemq/web/AuditFilter.java
View File

@ -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 {

2
activemq-web/src/main/java/org/apache/activemq/web/DestinationFacade.java
View File

@ -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;

24
activemq-web/src/main/java/org/apache/activemq/web/MessageListenerServlet.java
View File

@ -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;

16
activemq-web/src/main/java/org/apache/activemq/web/MessageQuery.java
View File

@ -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;

15
activemq-web/src/main/java/org/apache/activemq/web/MessageServlet.java
View File

@ -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;

14
activemq-web/src/main/java/org/apache/activemq/web/MessageServletSupport.java
View File

@ -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;

2
activemq-web/src/main/java/org/apache/activemq/web/NoDestinationSuppliedException.java
View File

@ -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

2
activemq-web/src/main/java/org/apache/activemq/web/NoSuchViewStyleException.java
View File

@ -16,7 +16,7 @@
*/
package org.apache.activemq.web;
import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
/**
*

14
activemq-web/src/main/java/org/apache/activemq/web/PortfolioPublishServlet.java
View File

@ -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

8
activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseQuery.java
View File

@ -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;
/**
*

18
activemq-web/src/main/java/org/apache/activemq/web/QueueBrowseServlet.java
View File

@ -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;

2
activemq-web/src/main/java/org/apache/activemq/web/QueueConsumerQuery.java
View File

@ -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;

2
activemq-web/src/main/java/org/apache/activemq/web/QueueProducerQuery.java
View File

@ -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;

16
activemq-web/src/main/java/org/apache/activemq/web/SessionFilter.java
View File

@ -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;
/* ------------------------------------------------------------ */
/**

4
activemq-web/src/main/java/org/apache/activemq/web/SessionListener.java
View File

@ -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 {

8
activemq-web/src/main/java/org/apache/activemq/web/SessionPool.java
View File

@ -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;

6
activemq-web/src/main/java/org/apache/activemq/web/SpringBrokerContextListener.java
View File

@ -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;

2
activemq-web/src/main/java/org/apache/activemq/web/TopicProducerQuery.java
View File

@ -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;

2
activemq-web/src/main/java/org/apache/activemq/web/TopicSubscriberQuery.java
View File

@ -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;

4
activemq-web/src/main/java/org/apache/activemq/web/UndeliveredAjaxMessage.java
View File

@ -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;

32
activemq-web/src/main/java/org/apache/activemq/web/WebClient.java
View File

@ -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;

12
activemq-web/src/main/java/org/apache/activemq/web/async/AsyncServletRequest.java
View File

@ -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;

2
activemq-web/src/main/java/org/apache/activemq/web/config/AbstractConfiguration.java
View File

@ -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;

2
activemq-web/src/main/java/org/apache/activemq/web/config/JNDIConfiguration.java
View File

@ -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;

12
activemq-web/src/main/java/org/apache/activemq/web/config/JspConfigurer.java
View File

@ -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$" );
}
}
}

2
activemq-web/src/main/java/org/apache/activemq/web/config/SystemPropertiesConfiguration.java
View File

@ -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;

2
activemq-web/src/main/java/org/apache/activemq/web/config/WebConsoleConfiguration.java
View File

@ -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;
/**

12
activemq-web/src/main/java/org/apache/activemq/web/view/MessageRenderer.java
View File

@ -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

14
activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java
View File

@ -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;

12
activemq-web/src/main/java/org/apache/activemq/web/view/SimpleMessageRenderer.java
View File

@ -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

10
activemq-web/src/main/java/org/apache/activemq/web/view/XmlMessageRenderer.java
View File

@ -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;