This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch activemq-5.17.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-5.17.x by this push:
     new 73ff47e9b AMQ-9408: fix jolokia-access.xml loading in Windows wrapper
73ff47e9b is described below

commit 73ff47e9bc09098129ceeadb9ef89985a3b20182
Author: JB Onofré <[email protected]>
AuthorDate: Wed Nov 29 10:56:33 2023 +0100

    AMQ-9408: fix jolokia-access.xml loading in Windows wrapper
    
    (cherry picked from commit d48f8ba201587650c6fae158b7ada10eacef05a4)
---
 assembly/src/release/bin/win64/wrapper.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assembly/src/release/bin/win64/wrapper.conf 
b/assembly/src/release/bin/win64/wrapper.conf
index fb010cbd2..5031b01cf 100644
--- a/assembly/src/release/bin/win64/wrapper.conf
+++ b/assembly/src/release/bin/win64/wrapper.conf
@@ -24,6 +24,7 @@ set.default.ACTIVEMQ_HOME=../..
 set.default.ACTIVEMQ_BASE=../..
 set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf
 set.default.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%/data
+set.default.JOLOKIA_CONF=file:..\\..\\conf\\jolokia-access.xml
 
 # if you use JDK 9+, uncomment the following
 #set.JDK_JAVA_OPTIONS=--add-reads=java.xml=java.logging --add-opens 
java.base/java.security=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED 
--add-opens java.base/java.lang=ALL-UNNAMED --add-opens 
java.base/java.util=ALL-UNNAMED --add-opens 
java.base/java.util.concurrent=ALL-UNNAMED --add-opens 
java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens 
java.naming/javax.naming.spi=ALL-UNNAMED --add-opens 
java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED --add-exports=java.base/sun.net. 
[...]
@@ -61,7 +62,7 @@ 
wrapper.java.additional.9=-Djava.util.logging.config.file=logging.properties
 wrapper.java.additional.10=-Dactivemq.conf="%ACTIVEMQ_CONF%"
 wrapper.java.additional.11=-Dactivemq.data="%ACTIVEMQ_DATA%"
 
wrapper.java.additional.12=-Djava.security.auth.login.config="%ACTIVEMQ_CONF%/login.config"
-wrapper.java.additional.13=-Djolokia.conf=file:%ACTIVEMQ_CONF%/jolokia-access.xml
+wrapper.java.additional.13=-Djolokia.conf="%JOLOKIA_CONF%"
 
 # Uncomment to enable remote jmx
 #wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616

Reply via email to