This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 5cd4cd2c1 AMQ-9405: fix Jetty examples about secure connector
new 285b75dc1 Merge pull request #1136 from jbonofre/AMQ-9405
5cd4cd2c1 is described below
commit 5cd4cd2c1b0fa939665d081115e3920deab070fc
Author: JB Onofré <[email protected]>
AuthorDate: Wed Nov 29 14:02:04 2023 +0100
AMQ-9405: fix Jetty examples about secure connector
---
assembly/src/release/conf/jetty.xml | 3 +--
assembly/src/release/examples/conf/jetty-demo.xml | 1 -
assembly/src/release/examples/conf/jetty-realm-5.x.xml | 3 +--
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/assembly/src/release/conf/jetty.xml
b/assembly/src/release/conf/jetty.xml
index 906e74914..e094b4f9d 100644
--- a/assembly/src/release/conf/jetty.xml
+++ b/assembly/src/release/conf/jetty.xml
@@ -171,8 +171,7 @@
<!-- bean id="SecureConnector"
class="org.eclipse.jetty.server.ServerConnector">
<constructor-arg ref="Server" />
<constructor-arg>
- <bean id="handlers"
class="org.eclipse.jetty.util.ssl.SslContextFactory">
-
+ <bean id="handlers"
class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
<property name="keyStorePath"
value="${activemq.conf}/broker.ks" />
<property name="keyStorePassword" value="password"
/>
</bean>
diff --git a/assembly/src/release/examples/conf/jetty-demo.xml
b/assembly/src/release/examples/conf/jetty-demo.xml
index ea1cbc513..00878e2cb 100644
--- a/assembly/src/release/examples/conf/jetty-demo.xml
+++ b/assembly/src/release/examples/conf/jetty-demo.xml
@@ -149,7 +149,6 @@
<constructor-arg ref="Server" />
<constructor-arg>
<bean id="handlers"
class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
-
<property
name="keyStorePath" value="${activemq.conf}/broker.ks" />
<property
name="keyStorePassword" value="password" />
</bean>
diff --git a/assembly/src/release/examples/conf/jetty-realm-5.x.xml
b/assembly/src/release/examples/conf/jetty-realm-5.x.xml
index cb901f2a6..f9c6575ef 100644
--- a/assembly/src/release/examples/conf/jetty-realm-5.x.xml
+++ b/assembly/src/release/examples/conf/jetty-realm-5.x.xml
@@ -175,8 +175,7 @@
<!-- bean id="SecureConnector"
class="org.eclipse.jetty.server.ServerConnector">
<constructor-arg ref="Server" />
<constructor-arg>
- <bean id="handlers"
class="org.eclipse.jetty.util.ssl.SslContextFactory">
-
+ <bean id="handlers"
class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">
<property
name="keyStorePath" value="${activemq.conf}/broker.ks" />
<property
name="keyStorePassword" value="password" />
</bean>
