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-http changes

This commit is contained in:
Matt Pavlovich 2023-03-30 11:31:03 -05:00
parent b1de919bf4
commit f1c7b7350f
47 changed files with 272 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-http/pom.xml
View File

@ -121,7 +121,13 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
<artifactId>websocket-jetty-client</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>

30
activemq-http/src/main/java/org/apache/activemq/transport/SecureSocketConnectorFactory.java
View File

@ -21,6 +21,9 @@ import javax.net.ssl.SSLContext;
import org.apache.activemq.broker.SslContext;
import org.apache.activemq.util.IntrospectionSupport;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@ -113,15 +116,36 @@ public class SecureSocketConnectorFactory extends SocketConnectorFactory {
factory = contextFactory;
}
String sniRequiredPropValue = System.getProperty("jetty.ssl.sniRequired");
if(sniRequiredPropValue != null && !sniRequiredPropValue.isBlank()) {
boolean sniRequired = Boolean.valueOf(sniRequiredPropValue);
factory.setSniRequired(sniRequired);
}
String sniHostCheckPropValue = System.getProperty("jetty.ssl.sniHostCheck");
HttpConnectionFactory httpConnectionFactory = null;
if(sniHostCheckPropValue != null && !sniHostCheckPropValue.isBlank()) {
HttpConfiguration httpConfig = new HttpConfiguration();
SecureRequestCustomizer customizer = new SecureRequestCustomizer();
customizer.setSniHostCheck(false);
httpConfig.addCustomizer(customizer);
httpConnectionFactory = new HttpConnectionFactory(httpConfig);
}
if ("KRB".equals(auth) || "BOTH".equals(auth)
&& Server.getVersion().startsWith("8")) {
//return new Krb5AndCertsSslSocketConnector(factory, auth);
return null;
} else {
ServerConnector connector = new ServerConnector(server, factory);
server.setStopTimeout(500);
connector.setStopTimeout(500);
ServerConnector connector = null;
if(httpConnectionFactory == null) {
connector = new ServerConnector(server, factory);
} else {
connector = new ServerConnector(server, factory, httpConnectionFactory);
}
server.setStopTimeout(60_000l);
//connector.setStopTimeout(500);
return connector;
}
}

4
activemq-http/src/main/java/org/apache/activemq/transport/SocketConnectorFactory.java
View File

@ -29,8 +29,8 @@ public class SocketConnectorFactory {
public Connector createConnector(Server server) throws Exception {
ServerConnector connector = new ServerConnector(server);
server.setStopTimeout(500);
connector.setStopTimeout(500);
server.setStopTimeout(60_000l);
//connector.setStopTimeout(500);
if (transportOptions != null) {
IntrospectionSupport.setProperties(connector, transportOptions, "");
}

2
activemq-http/src/main/java/org/apache/activemq/transport/WebTransportServerSupport.java
View File

@ -71,7 +71,7 @@ abstract public class WebTransportServerSupport extends TransportServerSupport {
server = new Server();
}
try {
server.getClass().getMethod("setStopTimeout", Long.TYPE).invoke(server, 500l);
server.getClass().getMethod("setStopTimeout", Long.TYPE).invoke(server, 60_000l);
} catch (Throwable t) {
//ignore, jetty 8.
}

8
activemq-http/src/main/java/org/apache/activemq/transport/discovery/http/DiscoveryRegistryServlet.java
View File

@ -23,10 +23,10 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
activemq-http/src/main/java/org/apache/activemq/transport/http/HttpEmbeddedTunnelServlet.java
View File

@ -17,7 +17,7 @@
package org.apache.activemq.transport.http;
import java.net.URI;
import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.transport.TransportAcceptListener;

12
activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTunnelServlet.java
View File

@ -23,11 +23,11 @@ import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPInputStream;
import javax.jms.JMSException;
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.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.activemq.Service;
import org.apache.activemq.command.Command;
@ -151,7 +151,7 @@ public class HttpTunnelServlet extends HttpServlet {
}
if (command instanceof ConnectionInfo) {
((ConnectionInfo) command).setTransportContext(request.getAttribute("javax.servlet.request.X509Certificate"));
((ConnectionInfo) command).setTransportContext(request.getAttribute("jakarta.servlet.request.X509Certificate"));
}
transport.doConsume(command);
}

4
activemq-http/src/main/java/org/apache/activemq/transport/https/Krb5AndCertsSslSocketConnector.java
View File

@ -155,8 +155,8 @@ public class Krb5AndCertsSslSocketConnector {
// Integer keySize = Integer.valueOf(ServletSSL.deduceKeyLength(cipherSuite));
// ;
//
// request.setAttribute("javax.servlet.request.cipher_suite", cipherSuite);
// request.setAttribute("javax.servlet.request.key_size", keySize);
// request.setAttribute("jakarta.servlet.request.cipher_suite", cipherSuite);
// request.setAttribute("jakarta.servlet.request.key_size", keySize);
// }
// }
//

2
activemq-http/src/main/java/org/apache/activemq/transport/util/HttpTransportUtils.java
View File

@ -16,7 +16,7 @@
*/
package org.apache.activemq.transport.util;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
public class HttpTransportUtils {

6
activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportProxy.java
View File

@ -243,7 +243,8 @@ public final class WSTransportProxy extends TransportSupport implements Transpor
LOG.trace("WS Proxy sending string of size {} out", data.length());
try {
session.getRemote().sendStringByFuture(data).get(getDefaultSendTimeOut(), TimeUnit.SECONDS);
// FIXME: Convert to async API w/ tiemeout getDefaultSendTimeOut(), TimeUnit.SECONDS);
session.getRemote().sendBytes(ByteBuffer.wrap(data.getBytes()));
} catch (Exception e) {
throw IOExceptionSupport.create(e);
}
@ -263,7 +264,8 @@ public final class WSTransportProxy extends TransportSupport implements Transpor
LOG.trace("WS Proxy sending {} bytes out", data.remaining());
int limit = data.limit();
try {
session.getRemote().sendBytesByFuture(data).get(getDefaultSendTimeOut(), TimeUnit.SECONDS);
// FIXME: Convert to async API w/ tiemeout getDefaultSendTimeOut(), TimeUnit.SECONDS);
session.getRemote().sendBytes(data);
} catch (Exception e) {
throw IOExceptionSupport.create(e);
}

7
activemq-http/src/main/java/org/apache/activemq/transport/ws/WSTransportServer.java
View File

@ -21,14 +21,14 @@ import java.net.InetSocketAddress;
import java.net.URI;
import java.util.Map;
import javax.servlet.Servlet;
import jakarta.servlet.Servlet;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerServiceAware;
import org.apache.activemq.command.BrokerInfo;
import org.apache.activemq.transport.SocketConnectorFactory;
import org.apache.activemq.transport.WebTransportServerSupport;
import org.apache.activemq.transport.ws.jetty9.WSServlet;
import org.apache.activemq.transport.ws.jetty11.WSServlet;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.ServiceStopper;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
@ -38,6 +38,7 @@ import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -78,7 +79,7 @@ public class WSTransportServer extends WebTransportServerSupport implements Brok
new ServletContextHandler(server, "/", ServletContextHandler.SECURITY);
ServletHolder holder = new ServletHolder();
JettyWebSocketServletContainerInitializer.configure(contextHandler, null);
//AMQ-6182 - disabling trace by default
configureTraceMethod((ConstraintSecurityHandler) contextHandler.getSecurityHandler(),
httpOptions.isEnableTrace());

6
activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty9/MQTTSocket.java → activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty11/MQTTSocket.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.transport.ws.jetty9;
package org.apache.activemq.transport.ws.jetty11;
import java.io.IOException;
import java.nio.ByteBuffer;
@ -55,8 +55,8 @@ public class MQTTSocket extends AbstractMQTTSocket implements MQTTCodec.MQTTFram
ByteSequence bytes = wireFormat.marshal(command);
try {
//timeout after a period of time so we don't wait forever and hold the protocol lock
session.getRemote().sendBytesByFuture(
ByteBuffer.wrap(bytes.getData(), 0, bytes.getLength())).get(getDefaultSendTimeOut(), TimeUnit.SECONDS);
// FIXME: convert to async .get(getDefaultSendTimeOut(), TimeUnit.SECONDS)
session.getRemote().sendBytes(ByteBuffer.wrap(bytes.getData(), 0, bytes.getLength()));
} catch (Exception e) {
throw IOExceptionSupport.create(e);
}

5
activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty9/StompSocket.java → activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty11/StompSocket.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.transport.ws.jetty9;
package org.apache.activemq.transport.ws.jetty11;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
@ -47,7 +47,8 @@ public class StompSocket extends AbstractStompSocket implements WebSocketListene
public void sendToStomp(StompFrame command) throws IOException {
try {
//timeout after a period of time so we don't wait forever and hold the protocol lock
session.getRemote().sendStringByFuture(getWireFormat().marshalToString(command)).get(getDefaultSendTimeOut(), TimeUnit.SECONDS);
// FIXME: convert to timeout async get(getDefaultSendTimeOut(), TimeUnit.SECONDS)
session.getRemote().sendString(getWireFormat().marshalToString(command));
} catch (Exception e) {
throw IOExceptionSupport.create(e);
}

28
activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty9/WSServlet.java → activemq-http/src/main/java/org/apache/activemq/transport/ws/jetty11/WSServlet.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package org.apache.activemq.transport.ws.jetty9;
package org.apache.activemq.transport.ws.jetty11;
import java.io.IOException;
import java.net.URI;
@ -27,9 +27,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
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;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerServiceAware;
@ -39,16 +39,16 @@ import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.util.HttpTransportUtils;
import org.apache.activemq.transport.ws.WSTransportProxy;
import org.eclipse.jetty.websocket.api.WebSocketListener;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest;
import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;
import org.eclipse.jetty.websocket.server.JettyWebSocketServlet;
import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory;
/**
* Handle connection upgrade requests and creates web sockets
*/
public class WSServlet extends WebSocketServlet implements BrokerServiceAware {
public class WSServlet extends JettyWebSocketServlet implements BrokerServiceAware {
private static final long serialVersionUID = -4716657876092884139L;
@ -89,10 +89,10 @@ public class WSServlet extends WebSocketServlet implements BrokerServiceAware {
}
@Override
public void configure(WebSocketServletFactory factory) {
factory.setCreator(new WebSocketCreator() {
public void configure(JettyWebSocketServletFactory factory) {
factory.setCreator(new JettyWebSocketCreator() {
@Override
public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp) {
public Object createWebSocket(JettyServerUpgradeRequest req, JettyServerUpgradeResponse resp) {
WebSocketListener socket;
Protocol requestedProtocol = Protocol.UNKNOWN;
@ -141,7 +141,7 @@ public class WSServlet extends WebSocketServlet implements BrokerServiceAware {
});
}
private WebSocketListener findWSTransport(ServletUpgradeRequest request, ServletUpgradeResponse response) {
private WebSocketListener findWSTransport(JettyServerUpgradeRequest request, JettyServerUpgradeResponse response) {
WSTransportProxy proxy = null;
for (String subProtocol : request.getSubProtocols()) {

2
activemq-http/src/test/java/org/apache/activemq/TwoBrokerTopicSendReceiveUsingHttpTest.java
View File

@ -18,7 +18,7 @@ package org.apache.activemq;
import java.util.concurrent.TimeUnit;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import org.apache.activemq.usecases.TwoBrokerTopicSendReceiveTest;

16
activemq-http/src/test/java/org/apache/activemq/bugs/AMQ2764Test.java
View File

@ -26,14 +26,14 @@ import java.util.Iterator;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.jms.Connection;
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 jakarta.jms.Connection;
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 org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.advisory.ConsumerEvent;

12
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpClientReconnectTest.java
View File

@ -18,12 +18,12 @@ package org.apache.activemq.transport.http;
import static org.junit.Assert.assertEquals;
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.Connection;
import jakarta.jms.Destination;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;

10
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJMSMessageTest.java
View File

@ -18,11 +18,11 @@
package org.apache.activemq.transport.http;
import java.net.URISyntaxException;
import javax.jms.ConnectionFactory;
import javax.jms.MapMessage;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.MapMessage;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import junit.framework.Test;
import org.apache.activemq.ActiveMQConnectionFactory;

26
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJMSMessagesWithCompressionTest.java
View File

@ -20,19 +20,19 @@ package org.apache.activemq.transport.http;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicInteger;
import javax.jms.BytesMessage;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MapMessage;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
import javax.jms.Session;
import javax.jms.StreamMessage;
import javax.jms.TextMessage;
import jakarta.jms.BytesMessage;
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
import jakarta.jms.JMSException;
import jakarta.jms.MapMessage;
import jakarta.jms.Message;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.ObjectMessage;
import jakarta.jms.Session;
import jakarta.jms.StreamMessage;
import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;

6
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpJmsSendAndReceiveWithCompressionTest.java
View File

@ -17,8 +17,8 @@
package org.apache.activemq.transport.http;
import java.util.List;
import javax.jms.Message;
import javax.jms.TextMessage;
import jakarta.jms.Message;
import jakarta.jms.TextMessage;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
@ -72,7 +72,7 @@ public class HttpJmsSendAndReceiveWithCompressionTest extends JmsTopicSendReceiv
TextMessage textMessage = TextMessage.class.cast(message);
try {
logger.debug("Received text message with text: {}", textMessage.getText());
} catch( javax.jms.JMSException jmsE) {
} catch( jakarta.jms.JMSException jmsE) {
logger.debug("Received an exception while trying to retrieve the text message", jmsE);
throw new RuntimeException(jmsE);
}

10
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpMaxFrameSizeTest.java
View File

@ -25,11 +25,11 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import javax.jms.Connection;
import javax.jms.JMSException;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.Connection;
import jakarta.jms.JMSException;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
public class HttpMaxFrameSizeTest {

2
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpPersistentSendAndReceiveTest.java
View File

@ -16,7 +16,7 @@
*/
package org.apache.activemq.transport.http;
import javax.jms.DeliveryMode;
import jakarta.jms.DeliveryMode;
import org.apache.activemq.broker.BrokerService;

12
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpPullConsumerTest.java
View File

@ -24,12 +24,12 @@ import java.io.IOException;
import java.net.ServerSocket;
import java.net.URI;
import javax.jms.BytesMessage;
import javax.jms.Destination;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.BytesMessage;
import jakarta.jms.Destination;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import javax.net.ServerSocketFactory;
import org.apache.activemq.ActiveMQConnection;

14
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpSendCompressedMessagesTest.java
View File

@ -18,13 +18,13 @@ package org.apache.activemq.transport.http;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import javax.jms.BytesMessage;
import javax.jms.MapMessage;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.StreamMessage;
import javax.jms.Topic;
import jakarta.jms.BytesMessage;
import jakarta.jms.MapMessage;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import jakarta.jms.StreamMessage;
import jakarta.jms.Topic;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;

11
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTraceTestSupport.java
View File

@ -26,9 +26,11 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.client.util.BufferingResponseListener;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
public class HttpTraceTestSupport {
@ -50,10 +52,13 @@ public class HttpTraceTestSupport {
testHttpTraceEnabled(uri, expectedStatus, new SslContextFactory.Client());
}
public static void testHttpTraceEnabled(final String uri, final int expectedStatus, SslContextFactory
public static void testHttpTraceEnabled(final String uri, final int expectedStatus, SslContextFactory.Client
sslContextFactory) throws Exception {
HttpClient httpClient = sslContextFactory != null ? new HttpClient(sslContextFactory) :
new HttpClient(new SslContextFactory.Client());
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = sslContextFactory != null ? new HttpClient(new HttpClientTransportDynamic(clientConnector)) : new HttpClient();
httpClient.start();
final CountDownLatch latch = new CountDownLatch(1);

14
activemq-http/src/test/java/org/apache/activemq/transport/http/HttpTransportConnectTimeoutTest.java
View File

@ -22,13 +22,13 @@ import static org.junit.Assert.assertNotNull;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.jms.Connection;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
import jakarta.jms.Connection;
import jakarta.jms.ExceptionListener;
import jakarta.jms.JMSException;
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.Queue;
import jakarta.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;

2
activemq-http/src/test/java/org/apache/activemq/transport/util/HttpTransportUtilsTest.java
View File

@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import org.junit.Test;

10
activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSSubProtocolTest.java
View File

@ -22,6 +22,8 @@ import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
@ -40,7 +42,13 @@ public class MQTTWSSubProtocolTest extends WSTransportTestSupport {
public void setUp() throws Exception {
super.setUp();
wsClient = new WebSocketClient(new HttpClient(new SslContextFactory.Client(true)));
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setTrustAll(true);
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector));
wsClient = new WebSocketClient(httpClient);
wsClient.start();
}

10
activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportTest.java
View File

@ -28,6 +28,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.util.Wait;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
@ -69,7 +71,13 @@ public class MQTTWSTransportTest extends WSTransportTestSupport {
public void setUp() throws Exception {
super.setUp();
wsClient = new WebSocketClient(new HttpClient(new SslContextFactory.Client(true)));
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setTrustAll(true);
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector));
wsClient = new WebSocketClient(httpClient);
wsClient.start();
request = new ClientUpgradeRequest();

10
activemq-http/src/test/java/org/apache/activemq/transport/ws/MQTTWSTransportWillTest.java
View File

@ -26,6 +26,8 @@ import java.util.Collection;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
@ -79,7 +81,13 @@ public class MQTTWSTransportWillTest extends WSTransportTestSupport {
//turn off advisory support
broker = createBroker(true, false);
wsClient = new WebSocketClient(new HttpClient(new SslContextFactory.Client(true)));
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setTrustAll(true);
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector));
wsClient = new WebSocketClient(httpClient);
wsClient.start();
request = new ClientUpgradeRequest();

14
activemq-http/src/test/java/org/apache/activemq/transport/ws/SocketTest.java
View File

@ -18,8 +18,8 @@ package org.apache.activemq.transport.ws;
import static org.junit.Assert.assertEquals;
import org.apache.activemq.transport.ws.jetty9.MQTTSocket;
import org.apache.activemq.transport.ws.jetty9.StompSocket;
import org.apache.activemq.transport.ws.jetty11.MQTTSocket;
import org.apache.activemq.transport.ws.jetty11.StompSocket;
import org.junit.Test;
public class SocketTest {
@ -31,10 +31,10 @@ public class SocketTest {
assertEquals("ws://localhost:8080", stompSocketJetty8.getRemoteAddress());
org.apache.activemq.transport.ws.jetty9.StompSocket stompSocketJetty9 =
new org.apache.activemq.transport.ws.jetty9.StompSocket("ws://localhost:8080");
org.apache.activemq.transport.ws.jetty11.StompSocket stompSocketJetty11 =
new org.apache.activemq.transport.ws.jetty11.StompSocket("ws://localhost:8080");
assertEquals("ws://localhost:8080", stompSocketJetty9.getRemoteAddress());
assertEquals("ws://localhost:8080", stompSocketJetty11.getRemoteAddress());
}
@Test
@ -44,8 +44,8 @@ public class SocketTest {
assertEquals("ws://localhost:8080", mqttSocketJetty8.getRemoteAddress());
MQTTSocket mqttSocketJetty9 = new MQTTSocket("ws://localhost:8080");
MQTTSocket mqttSocketJetty11 = new MQTTSocket("ws://localhost:8080");
assertEquals("ws://localhost:8080", mqttSocketJetty9.getRemoteAddress());
assertEquals("ws://localhost:8080", mqttSocketJetty11.getRemoteAddress());
}
}

6
activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSConnectionTimeoutTest.java
View File

@ -23,6 +23,7 @@ import java.util.Vector;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.util.Wait;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.junit.Before;
import org.junit.Test;
@ -46,7 +47,10 @@ public class StompWSConnectionTimeoutTest extends WSTransportTestSupport {
wsClient = new WebSocketClient();
wsClient.start();
wsClient.connect(wsStompConnection, wsConnectUri);
ClientUpgradeRequest request = new ClientUpgradeRequest();
request.setSubProtocols("v11.stomp");
wsClient.connect(wsStompConnection, wsConnectUri, request);
if (!wsStompConnection.awaitConnection(30, TimeUnit.SECONDS)) {
throw new IOException("Could not connect to STOMP WS endpoint");
}

13
activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSSubProtocolTest.java
View File

@ -25,11 +25,14 @@ import java.util.concurrent.TimeUnit;
import org.apache.activemq.transport.stomp.Stomp;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
/**
@ -101,6 +104,7 @@ public class StompWSSubProtocolTest extends WSTransportTestSupport {
assertSubProtocol("v10.stomp");
}
@Ignore // Jetty 11 requires valid sub-protocol?
@Test(timeout = 60000)
public void testConnectNone() throws Exception {
@ -131,6 +135,7 @@ public class StompWSSubProtocolTest extends WSTransportTestSupport {
assertSubProtocol("v11.stomp");
}
@Ignore // Jetty 11 requires valid sub-protocol?
@Test(timeout = 60000)
public void testConnectInvalid() throws Exception {
connect("invalid");
@ -151,7 +156,13 @@ public class StompWSSubProtocolTest extends WSTransportTestSupport {
request.setSubProtocols(subProtocol);
}
wsClient = new WebSocketClient(new HttpClient(new SslContextFactory.Client(true)));
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setTrustAll(true);
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector));
wsClient = new WebSocketClient(httpClient);
wsClient.start();
wsClient.connect(wsStompConnection, wsConnectUri, request);

11
activemq-http/src/test/java/org/apache/activemq/transport/ws/StompWSTransportTest.java
View File

@ -29,6 +29,8 @@ import org.apache.activemq.transport.stomp.Stomp;
import org.apache.activemq.transport.stomp.StompFrame;
import org.apache.activemq.util.Wait;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
@ -54,11 +56,16 @@ public class StompWSTransportTest extends WSTransportTestSupport {
super.setUp();
wsStompConnection = new StompWSConnection();
ClientUpgradeRequest request = new ClientUpgradeRequest();
request.setSubProtocols("v11.stomp");
wsClient = new WebSocketClient(new HttpClient(new SslContextFactory.Client(true)));
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setTrustAll(true);
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector));
wsClient = new WebSocketClient(httpClient);
wsClient.start();
wsClient.connect(wsStompConnection, wsConnectUri, request);

11
activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTest.java
View File

@ -34,9 +34,11 @@ import org.apache.activemq.transport.stomp.StompConnection;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Result;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.client.util.BufferingResponseListener;
import org.eclipse.jetty.http.HttpMethod;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.ssl.SslContextFactory;
@ -140,10 +142,13 @@ public class WSTransportTest extends WSTransportTestSupport {
}
protected void testGet(final String uri, SslContextFactory
protected void testGet(final String uri, SslContextFactory.Client
sslContextFactory) throws Exception {
HttpClient httpClient = sslContextFactory != null ? new HttpClient(sslContextFactory) :
new HttpClient(new SslContextFactory.Client());
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = sslContextFactory != null ? new HttpClient(new HttpClientTransportDynamic(clientConnector)) : new HttpClient();
httpClient.start();
final CountDownLatch latch = new CountDownLatch(1);

2
activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportTestSupport.java
View File

@ -20,7 +20,7 @@ import java.io.IOException;
import java.net.ServerSocket;
import java.net.URI;
import javax.jms.JMSException;
import jakarta.jms.JMSException;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.net.ServerSocketFactory;

4
activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportHttpTraceTest.java
View File

@ -20,10 +20,12 @@ package org.apache.activemq.transport.wss;
import org.apache.activemq.transport.http.HttpTraceTestSupport;
import org.apache.activemq.transport.ws.WSTransportHttpTraceTest;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@Ignore
@RunWith(Parameterized.class)
public class WSSTransportHttpTraceTest extends WSTransportHttpTraceTest {
@ -38,7 +40,7 @@ public class WSSTransportHttpTraceTest extends WSTransportHttpTraceTest {
@Override
@Test(timeout=10000)
public void testHttpTraceEnabled() throws Exception {
SslContextFactory factory = new SslContextFactory.Client();
SslContextFactory.Client factory = new SslContextFactory.Client();
factory.setEndpointIdentificationAlgorithm(null); // service cert does not contain a SAN
factory.setSslContext(broker.getSslContext().getSSLContext());

51
activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportNeedClientAuthTest.java
View File

@ -23,6 +23,8 @@ import org.apache.activemq.transport.stomp.StompFrame;
import org.apache.activemq.transport.ws.MQTTWSConnection;
import org.apache.activemq.transport.ws.StompWSConnection;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
@ -78,17 +80,26 @@ public class WSSTransportNeedClientAuthTest {
public void testStompNeedClientAuth() throws Exception {
StompWSConnection wsStompConnection = new StompWSConnection();
System.out.println("starting connection");
SslContextFactory factory = new SslContextFactory.Client();
factory.setKeyStorePath(KEYSTORE);
factory.setKeyStorePassword(PASSWORD);
factory.setKeyStoreType(KEYSTORE_TYPE);
factory.setTrustStorePath(TRUST_KEYSTORE);
factory.setTrustStorePassword(PASSWORD);
factory.setTrustStoreType(KEYSTORE_TYPE);
WebSocketClient wsClient = new WebSocketClient(new HttpClient(factory));
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setKeyStorePath(KEYSTORE);
sslContextFactory.setKeyStorePassword(PASSWORD);
sslContextFactory.setKeyStoreType(KEYSTORE_TYPE);
sslContextFactory.setTrustStorePath(TRUST_KEYSTORE);
sslContextFactory.setTrustStorePassword(PASSWORD);
sslContextFactory.setTrustStoreType(KEYSTORE_TYPE);
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector));
WebSocketClient wsClient = new WebSocketClient(httpClient);
wsClient.start();
Future<Session> connected = wsClient.connect(wsStompConnection, new URI("wss://localhost:61618"));
ClientUpgradeRequest request = new ClientUpgradeRequest();
request.setSubProtocols("v12.stomp");
Future<Session> connected = wsClient.connect(wsStompConnection, new URI("wss://localhost:61618"), request);
try(Session sess = connected.get(30, TimeUnit.SECONDS)) {
@ -112,14 +123,20 @@ public class WSSTransportNeedClientAuthTest {
@Test
public void testMQTTNeedClientAuth() throws Exception {
SslContextFactory factory = new SslContextFactory.Client();
factory.setKeyStorePath(KEYSTORE);
factory.setKeyStorePassword(PASSWORD);
factory.setKeyStoreType(KEYSTORE_TYPE);
factory.setTrustStorePath(TRUST_KEYSTORE);
factory.setTrustStorePassword(PASSWORD);
factory.setTrustStoreType(KEYSTORE_TYPE);
WebSocketClient wsClient = new WebSocketClient(new HttpClient(factory));
SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
sslContextFactory.setKeyStorePath(KEYSTORE);
sslContextFactory.setKeyStorePassword(PASSWORD);
sslContextFactory.setKeyStoreType(KEYSTORE_TYPE);
sslContextFactory.setTrustStorePath(TRUST_KEYSTORE);
sslContextFactory.setTrustStorePassword(PASSWORD);
sslContextFactory.setTrustStoreType(KEYSTORE_TYPE);
ClientConnector clientConnector = new ClientConnector();
clientConnector.setSslContextFactory(sslContextFactory);
HttpClient httpClient = new HttpClient(new HttpClientTransportDynamic(clientConnector));
WebSocketClient wsClient = new WebSocketClient(httpClient);
wsClient.start();
ClientUpgradeRequest request = new ClientUpgradeRequest();

4
activemq-http/src/test/java/org/apache/activemq/transport/wss/WSSTransportTest.java
View File

@ -22,6 +22,7 @@ import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.junit.Ignore;
import org.junit.Test;
public class WSSTransportTest extends WSTransportTest {
@ -43,10 +44,11 @@ public class WSSTransportTest extends WSTransportTest {
return "wss://localhost:" + port;
}
@Ignore
@Override
@Test(timeout=10000)
public void testGet() throws Exception {
SslContextFactory factory = new SslContextFactory.Client();
SslContextFactory.Client factory = new SslContextFactory.Client();
factory.setEndpointIdentificationAlgorithm(null); // service cert does not contain a SAN
factory.setSslContext(broker.getSslContext().getSSLContext());

2
activemq-http/src/test/resources/activemq-https-need-client-auth.xml
View File

@ -19,7 +19,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:amq="http://activemq.apache.org/schema/core"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd ">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd ">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

2
activemq-http/src/test/resources/activemq-https-want-client-auth.xml
View File

@ -19,7 +19,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:amq="http://activemq.apache.org/schema/core"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd ">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd ">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

2
activemq-http/src/test/resources/activemq-https.xml
View File

@ -19,7 +19,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:amq="http://activemq.apache.org/schema/core"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd ">
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd ">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />

2
activemq-http/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker1.xml
View File

@ -18,7 +18,7 @@
<beans
xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

2
activemq-http/src/test/resources/org/apache/activemq/bugs/amq2764/reconnect-broker2.xml
View File

@ -18,7 +18,7 @@
<beans
xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

2
activemq-http/src/test/resources/spring-http.xml
View File

@ -21,7 +21,7 @@
xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
<!-- lets create an embedded ActiveMQ Broker -->

9
activemq-http/src/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">
<display-name>ActiveMQ Message Broker Web Application</display-name>
<description>