This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
from 91e35e07de Ensure composite temp dests are handled in
AuthorizationBroker (#2219)
new d31d590f0b [AMQ-9359] Jetty-12 conversion
new a603710b90 [AMQ-9359] Switch to Jetty 12 native websocket API
new 92efb318cb [Jetty 12] Use proper jetty-ee9-maven-plugin
new 6c54b268f0 Update MQTTWSConnection used for testing
new bb5ccb4aaf [AMQ-9359] Migrate Jetty EE9 -> EE11
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
activemq-amqp/pom.xml | 9 +-
activemq-http/pom.xml | 34 +-
.../transport/SecureSocketConnectorFactory.java | 73 +++-
.../transport/WebTransportServerSupport.java | 46 ++-
.../discovery/http/EmbeddedJettyServer.java | 4 +-
.../transport/http/HttpTransportServer.java | 20 +-
.../activemq/transport/ws/StompWSConnection.java | 35 +-
.../activemq/transport/ws/WSTransportProxy.java | 31 +-
.../activemq/transport/ws/WSTransportServer.java | 21 +-
.../transport/ws/{jetty11 => ee11}/MQTTSocket.java | 24 +-
.../ws/{jetty11 => ee11}/StompSocket.java | 20 +-
.../transport/ws/{jetty11 => ee11}/WSServlet.java | 18 +-
...ecureSocketConnectorFactoryKeyPasswordTest.java | 89 +++++
.../SecureSocketConnectorFactorySniTest.java | 82 +++++
.../transport/http/HttpTraceTestSupport.java | 8 +-
.../activemq/transport/ws/MQTTWSConnection.java | 60 ++--
.../transport/ws/MQTTWSSubProtocolTest.java | 2 +-
.../activemq/transport/ws/MQTTWSTransportTest.java | 12 +-
.../transport/ws/MQTTWSTransportWillTest.java | 2 +-
.../apache/activemq/transport/ws/SocketTest.java | 8 +-
.../transport/ws/StompWSSubProtocolTest.java | 2 +-
.../transport/ws/StompWSTransportTest.java | 2 +-
.../transport/ws/WSTransportProxyTest.java | 88 +++++
.../activemq/transport/ws/WSTransportTest.java | 12 +-
.../transport/wss/WSSTransportHttpTraceTest.java | 2 +-
.../wss/WSSTransportNeedClientAuthTest.java | 4 +-
.../transport/xstream/XStreamWireFormatTest.java | 1 -
.../test/resources/keystore-diff-key-password.jks | Bin 0 -> 2082 bytes
activemq-http/src/test/resources/spring-http.xml | 2 +-
activemq-osgi/pom.xml | 13 +
activemq-web-console/pom.xml | 58 ++--
.../spring/jetty/JettyServerBeanSslTest.java | 98 ++++++
.../activemq/spring/jetty/JettyServerBeanTest.java | 60 ++++
.../java/org/apache/activemq/web/tool/Main.java | 17 +-
.../src/test/resources/conf-ssl/jetty-keystore.ks | Bin 0 -> 2732 bytes
.../resources/conf-ssl/jetty-spring.properties | 17 +-
.../resources/conf-ssl/jetty-spring.xml} | 17 +-
.../test/resources/conf/jetty-spring.properties | 15 +-
.../resources/conf/jetty-spring.xml} | 20 +-
.../resources/jetty/jetty-activemq-console.xml | 14 +-
.../test/resources/jetty/jetty-bytebufferpool.xml | 35 +-
.../resources/jetty/jetty-connection-limit.xml | 39 ++-
.../src/test/resources/jetty/jetty-dos.xml | 46 +++
.../src/test/resources/jetty/jetty-http-config.xml | 72 ++++
.../src/test/resources/jetty/jetty-http.xml | 66 ++++
.../src/test/resources/jetty/jetty-https.xml | 44 +++
.../test/resources/jetty/jetty-min-data-rate.xml | 37 +--
.../jetty/jetty-network-connection-limit.xml | 39 ++-
.../src/test/resources/jetty/jetty-requestlog.xml | 64 ++++
.../src/test/resources/jetty/jetty-scheduler.xml | 19 +-
.../test/resources/jetty/jetty-secure-redirect.xml | 23 +-
.../src/test/resources/jetty/jetty-security.xml | 117 +++++++
.../src/test/resources/jetty/jetty-size-limit.xml | 33 +-
.../src/test/resources/jetty/jetty-ssl-context.xml | 83 +++++
.../src/test/resources/jetty/jetty-ssl.xml | 79 +++++
.../test/resources/jetty/jetty-thread-limit.xml | 72 ++++
.../src/test/resources/jetty/jetty-threadpool.xml | 48 +++
.../src/test/resources/jetty/jetty-webapps.xml | 144 ++++++++
.../src/test/resources/jetty/jetty.xml | 59 ++++
.../test/resources/webapps/admin/WEB-INF/web.xml | 10 +-
.../src/test/resources/webapps/admin/index.html | 14 +-
.../src/test/resources/webapps/api/WEB-INF/web.xml | 10 +-
.../src/test/resources/webapps/api/index.html | 13 +-
.../src/test/resources/webapps/index.html | 13 +-
activemq-web-demo/pom.xml | 22 +-
.../java/org/apache/activemq/web/AjaxTest.java | 51 +--
.../java/org/apache/activemq/web/JettyServer.java | 6 +-
.../org/apache/activemq/web/JettyTestSupport.java | 6 +-
.../apache/activemq/web/RestPersistentTest.java | 28 +-
.../java/org/apache/activemq/web/RestTest.java | 116 ++++---
activemq-web/pom.xml | 8 +-
.../activemq/spring/jetty/JettyServerBean.java | 282 ++++++++++++++++
.../org/apache/activemq/web/MessageServlet.java | 12 +-
.../apache/activemq/web/MessageServletSupport.java | 25 +-
.../activemq/web/async/AsyncServletRequest.java | 7 +-
.../apache/activemq/web/config/JspConfigurer.java | 9 +-
assembly/pom.xml | 129 +++++++-
assembly/src/main/descriptors/common-bin.xml | 47 +--
assembly/src/release/conf/activemq.xml | 7 +-
assembly/src/release/conf/jetty-keystore.ks | Bin 0 -> 2726 bytes
assembly/src/release/conf/jetty-spring.properties | 57 ++++
.../src/release/conf/jetty-spring.xml | 18 +-
assembly/src/release/conf/jetty.xml | 367 ---------------------
.../release/conf/jetty/jetty-bytebufferpool.xml | 35 +-
.../release/conf/jetty/jetty-connection-limit.xml | 39 ++-
assembly/src/release/conf/jetty/jetty-dos.xml | 46 +++
.../src/release/conf/jetty/jetty-http-config.xml | 72 ++++
assembly/src/release/conf/jetty/jetty-http.xml | 66 ++++
assembly/src/release/conf/jetty/jetty-https.xml | 44 +++
.../src/release/conf/jetty/jetty-min-data-rate.xml | 37 +--
.../conf/jetty/jetty-network-connection-limit.xml | 39 ++-
.../src/release/conf/jetty/jetty-requestlog.xml | 64 ++++
.../src/release/conf/jetty/jetty-scheduler.xml | 19 +-
.../release/conf/jetty/jetty-secure-redirect.xml | 23 +-
assembly/src/release/conf/jetty/jetty-security.xml | 117 +++++++
.../src/release/conf/jetty/jetty-size-limit.xml | 33 +-
.../src/release/conf/jetty/jetty-ssl-context.xml | 83 +++++
assembly/src/release/conf/jetty/jetty-ssl.xml | 79 +++++
.../src/release/conf/jetty/jetty-thread-limit.xml | 72 ++++
.../src/release/conf/jetty/jetty-threadpool.xml | 48 +++
assembly/src/release/conf/jetty/jetty-webapps.xml | 204 ++++++++++++
assembly/src/release/conf/jetty/jetty.xml | 59 ++++
assembly/src/release/conf/log4j2.properties | 4 +
.../src/release/examples/conf/activemq-demo.xml | 2 +-
.../release/examples/conf/activemq-security.xml | 2 +-
.../src/release/examples/conf/activemq-stomp.xml | 2 +-
pom.xml | 24 +-
107 files changed, 3573 insertions(+), 1056 deletions(-)
rename activemq-http/src/main/java/org/apache/activemq/transport/ws/{jetty11
=> ee11}/MQTTSocket.java (85%)
rename activemq-http/src/main/java/org/apache/activemq/transport/ws/{jetty11
=> ee11}/StompSocket.java (81%)
rename activemq-http/src/main/java/org/apache/activemq/transport/ws/{jetty11
=> ee11}/WSServlet.java (93%)
create mode 100644
activemq-http/src/test/java/org/apache/activemq/transport/SecureSocketConnectorFactoryKeyPasswordTest.java
create mode 100644
activemq-http/src/test/java/org/apache/activemq/transport/SecureSocketConnectorFactorySniTest.java
create mode 100644
activemq-http/src/test/java/org/apache/activemq/transport/ws/WSTransportProxyTest.java
create mode 100644
activemq-http/src/test/resources/keystore-diff-key-password.jks
create mode 100644
activemq-web-console/src/test/java/org/apache/activemq/spring/jetty/JettyServerBeanSslTest.java
create mode 100644
activemq-web-console/src/test/java/org/apache/activemq/spring/jetty/JettyServerBeanTest.java
create mode 100644
activemq-web-console/src/test/resources/conf-ssl/jetty-keystore.ks
copy activemq-jaas/src/test/resources/groups.properties =>
activemq-web-console/src/test/resources/conf-ssl/jetty-spring.properties (50%)
copy activemq-web-console/src/{main/webapp/WEB-INF/webconsole-default.xml =>
test/resources/conf-ssl/jetty-spring.xml} (69%)
copy activemq-jaas/src/test/resources/groups.properties =>
activemq-web-console/src/test/resources/conf/jetty-spring.properties (55%)
copy activemq-web-console/src/{main/webapp/WEB-INF/webconsole-default.xml =>
test/resources/conf/jetty-spring.xml} (62%)
copy activemq-unit-tests/src/test/data/message1.xml =>
activemq-web-console/src/test/resources/jetty/jetty-activemq-console.xml (75%)
copy activemq-http/src/test/resources/jetty.xml =>
activemq-web-console/src/test/resources/jetty/jetty-bytebufferpool.xml (50%)
copy activemq-spring/src/test/resources/spring-embedded-pooled.xml =>
activemq-web-console/src/test/resources/jetty/jetty-connection-limit.xml (54%)
create mode 100644 activemq-web-console/src/test/resources/jetty/jetty-dos.xml
create mode 100644
activemq-web-console/src/test/resources/jetty/jetty-http-config.xml
create mode 100644 activemq-web-console/src/test/resources/jetty/jetty-http.xml
create mode 100644
activemq-web-console/src/test/resources/jetty/jetty-https.xml
copy activemq-spring/src/test/resources/spring-embedded-pooled.xml =>
activemq-web-console/src/test/resources/jetty/jetty-min-data-rate.xml (58%)
copy activemq-spring/src/test/resources/spring-embedded-pooled.xml =>
activemq-web-console/src/test/resources/jetty/jetty-network-connection-limit.xml
(53%)
create mode 100644
activemq-web-console/src/test/resources/jetty/jetty-requestlog.xml
copy activemq-broker/src/main/java/org/apache/activemq/broker/package.html =>
activemq-web-console/src/test/resources/jetty/jetty-scheduler.xml (62%)
mode change 100755 => 100644
copy activemq-broker/src/main/java/org/apache/activemq/broker/package.html =>
activemq-web-console/src/test/resources/jetty/jetty-secure-redirect.xml (63%)
mode change 100755 => 100644
create mode 100644
activemq-web-console/src/test/resources/jetty/jetty-security.xml
copy activemq-spring/src/test/resources/spring-embedded-pooled.xml =>
activemq-web-console/src/test/resources/jetty/jetty-size-limit.xml (59%)
create mode 100644
activemq-web-console/src/test/resources/jetty/jetty-ssl-context.xml
create mode 100644 activemq-web-console/src/test/resources/jetty/jetty-ssl.xml
create mode 100644
activemq-web-console/src/test/resources/jetty/jetty-thread-limit.xml
create mode 100644
activemq-web-console/src/test/resources/jetty/jetty-threadpool.xml
create mode 100644
activemq-web-console/src/test/resources/jetty/jetty-webapps.xml
create mode 100644 activemq-web-console/src/test/resources/jetty/jetty.xml
copy activemq-unit-tests/src/test/data/message1.xml =>
activemq-web-console/src/test/resources/webapps/admin/WEB-INF/web.xml (73%)
copy activemq-broker/src/main/java/org/apache/activemq/broker/jmx/package.html
=> activemq-web-console/src/test/resources/webapps/admin/index.html (88%)
mode change 100755 => 100644
copy activemq-unit-tests/src/test/data/message1.xml =>
activemq-web-console/src/test/resources/webapps/api/WEB-INF/web.xml (73%)
copy activemq-broker/src/main/java/org/apache/activemq/network/package.html =>
activemq-web-console/src/test/resources/webapps/api/index.html (88%)
mode change 100755 => 100644
copy activemq-broker/src/main/java/org/apache/activemq/network/package.html =>
activemq-web-console/src/test/resources/webapps/index.html (88%)
mode change 100755 => 100644
create mode 100644
activemq-web/src/main/java/org/apache/activemq/spring/jetty/JettyServerBean.java
create mode 100644 assembly/src/release/conf/jetty-keystore.ks
create mode 100644 assembly/src/release/conf/jetty-spring.properties
copy activemq-web-console/src/main/webapp/WEB-INF/webconsole-default.xml =>
assembly/src/release/conf/jetty-spring.xml (63%)
delete mode 100644 assembly/src/release/conf/jetty.xml
copy activemq-http/src/test/resources/jetty.xml =>
assembly/src/release/conf/jetty/jetty-bytebufferpool.xml (50%)
copy activemq-spring/src/test/resources/spring-embedded-pooled.xml =>
assembly/src/release/conf/jetty/jetty-connection-limit.xml (54%)
create mode 100644 assembly/src/release/conf/jetty/jetty-dos.xml
create mode 100644 assembly/src/release/conf/jetty/jetty-http-config.xml
create mode 100644 assembly/src/release/conf/jetty/jetty-http.xml
create mode 100644 assembly/src/release/conf/jetty/jetty-https.xml
copy activemq-spring/src/test/resources/spring-embedded-pooled.xml =>
assembly/src/release/conf/jetty/jetty-min-data-rate.xml (58%)
copy activemq-spring/src/test/resources/spring-embedded-pooled.xml =>
assembly/src/release/conf/jetty/jetty-network-connection-limit.xml (53%)
create mode 100644 assembly/src/release/conf/jetty/jetty-requestlog.xml
copy activemq-broker/src/main/java/org/apache/activemq/broker/package.html =>
assembly/src/release/conf/jetty/jetty-scheduler.xml (62%)
mode change 100755 => 100644
copy activemq-broker/src/main/java/org/apache/activemq/broker/package.html =>
assembly/src/release/conf/jetty/jetty-secure-redirect.xml (63%)
mode change 100755 => 100644
create mode 100644 assembly/src/release/conf/jetty/jetty-security.xml
copy activemq-spring/src/test/resources/spring-embedded-pooled.xml =>
assembly/src/release/conf/jetty/jetty-size-limit.xml (59%)
create mode 100644 assembly/src/release/conf/jetty/jetty-ssl-context.xml
create mode 100644 assembly/src/release/conf/jetty/jetty-ssl.xml
create mode 100644 assembly/src/release/conf/jetty/jetty-thread-limit.xml
create mode 100644 assembly/src/release/conf/jetty/jetty-threadpool.xml
create mode 100644 assembly/src/release/conf/jetty/jetty-webapps.xml
create mode 100644 assembly/src/release/conf/jetty/jetty.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
