[activemq] branch activemq-5.17.x updated: [AMQ-8546] Move jolokia-access.xml into ActiveMQ conf folder

[jbonofre]

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 2c5d4c286 [AMQ-8546] Move jolokia-access.xml into ActiveMQ conf folder
2c5d4c286 is described below

commit 2c5d4c286a4bbfaaed8a0f1149face70a23cd761
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Wed Apr 20 07:58:50 2022 +0200

    [AMQ-8546] Move jolokia-access.xml into ActiveMQ conf folder
    
    (cherry picked from commit c56907a825889152a56a10bc7ba842eb734b5280)
---
 .../release/{webapps/api/WEB-INF/classes => conf}/jolokia-access.xml  | 0
 assembly/src/release/webapps/api/WEB-INF/web.xml                      | 4 ++++
 2 files changed, 4 insertions(+)

diff --git 
a/assembly/src/release/webapps/api/WEB-INF/classes/jolokia-access.xml 
b/assembly/src/release/conf/jolokia-access.xml
similarity index 100%
rename from assembly/src/release/webapps/api/WEB-INF/classes/jolokia-access.xml
rename to assembly/src/release/conf/jolokia-access.xml
diff --git a/assembly/src/release/webapps/api/WEB-INF/web.xml 
b/assembly/src/release/webapps/api/WEB-INF/web.xml
index e31642205..56825838c 100644
--- a/assembly/src/release/webapps/api/WEB-INF/web.xml
+++ b/assembly/src/release/webapps/api/WEB-INF/web.xml
@@ -53,6 +53,10 @@
           <param-value>Apache ActiveMQ</param-value>
         </init-param>
         -->
+        <init-param>
+            <param-name>policyLocation</param-name>
+            
<param-value>file:${prop:activemq.conf}/jolokia-access.xml</param-value>
+        </init-param>
         <!-- turn off returning exceptions and stacktraces from jolokia -->
         <init-param>
           <param-name>allowErrorDetails</param-name>