You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2021/03/15 06:53:05 UTC
[activemq] branch activemq-5.16.x updated: AMQ-8048 replace
SslContextFactory with SslContextFactory$Server & fix assembly
BrokerXmlConfigStartTest activemq-security.xml test
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
new 20d822f AMQ-8048 replace SslContextFactory with SslContextFactory$Server & fix assembly BrokerXmlConfigStartTest activemq-security.xml test
20d822f is described below
commit 20d822fbb8f67c3297e06d7877fd1b8972f268b8
Author: Charlie Chen <ch...@amazon.com>
AuthorDate: Sun Mar 7 11:54:59 2021 -0800
AMQ-8048 replace SslContextFactory with SslContextFactory$Server & fix assembly BrokerXmlConfigStartTest activemq-security.xml test
(cherry picked from commit 86eda3a6b1541ba71878e31848f6a02e1bba8966)
---
assembly/src/release/examples/conf/jetty-demo.xml | 8 ++++----
.../apache/activemq/config/BrokerXmlConfigStartTest.java | 16 ++++++++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/assembly/src/release/examples/conf/jetty-demo.xml b/assembly/src/release/examples/conf/jetty-demo.xml
index 6d7e877..82e341c 100644
--- a/assembly/src/release/examples/conf/jetty-demo.xml
+++ b/assembly/src/release/examples/conf/jetty-demo.xml
@@ -143,19 +143,19 @@
<property name="port" value="#{systemProperties['jetty.port']}" />
</bean>
<!--
- Enable this connector if you wish to use https with web console
+ Enable this connector to use https with web console
-->
- <!-- bean id="SecureConnector" class="org.eclipse.jetty.server.ServerConnector">
+ <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>
</constructor-arg>
<property name="port" value="8162" />
- </bean -->
+ </bean>
</list>
</property>
</bean>
diff --git a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
index ef54c05..2c9a954 100644
--- a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
+++ b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
@@ -20,10 +20,12 @@ import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.IOException;
+import java.lang.reflect.Field;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -142,10 +144,24 @@ public class BrokerXmlConfigStartTest {
System.setProperty("activemq.conf", "target/conf");
secProps = new Properties();
secProps.load(new FileInputStream(new File("target/conf/credentials.properties")));
+ setEnv("ACTIVEMQ_ENCRYPTION_PASSWORD", "activemq");
}
@After
public void tearDown() throws Exception {
TimeUnit.SECONDS.sleep(1);
}
+
+ private void setEnv(String key, String value) {
+ try {
+ Map<String, String> env = System.getenv();
+ Class<?> cl = env.getClass();
+ Field field = cl.getDeclaredField("m");
+ field.setAccessible(true);
+ Map<String, String> writableEnv = (Map<String, String>) field.get(env);
+ writableEnv.put(key, value);
+ } catch (Exception e) {
+ throw new IllegalStateException("Failed to set environment variable", e);
+ }
+ }
}