(activemq) branch activemq-6.0.x updated: Revert "AMQ-9460: Don't override ACTIVEMQ_OPTS when provided by user"

[jbonofre]

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

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


The following commit(s) were added to refs/heads/activemq-6.0.x by this push:
     new 3636a497e Revert "AMQ-9460: Don't override ACTIVEMQ_OPTS when provided 
by user"
3636a497e is described below

commit 3636a497ede5b95cf8257c2f359a3bc8a02fb325
Author: JB Onofré <jbono...@apache.org>
AuthorDate: Mon Apr 1 11:29:18 2024 +0200

    Revert "AMQ-9460: Don't override ACTIVEMQ_OPTS when provided by user"
    
    This reverts commit f761b6598ef91458e56a6b873ea9f753e1333e07.
---
 assembly/src/docker/Dockerfile    | 2 +-
 assembly/src/release/bin/activemq | 7 +++++++
 assembly/src/release/bin/setenv   | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/assembly/src/docker/Dockerfile b/assembly/src/docker/Dockerfile
index 596265c5e..819b64c11 100644
--- a/assembly/src/docker/Dockerfile
+++ b/assembly/src/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV ACTIVEMQ_HOME $ACTIVEMQ_INSTALL_PATH/apache-activemq
 ENV ACTIVEMQ_EXEC exec
 ENV PATH $PATH:$ACTIVEMQ_HOME/bin
 # Make the Web console accesible from outside the container
-ENV ACTIVEMQ_OPTS -Djetty.host=0.0.0.0
+ENV ACTIVEMQ_OPTS $ACTIVEMQ_OPTS -Djetty.host=0.0.0.0
 #WORKDIR $ACTIVEMQ_HOME
 
 # activemq_dist can point to a directory or a tarball on the local system
diff --git a/assembly/src/release/bin/activemq 
b/assembly/src/release/bin/activemq
index 720cd0e58..8a51f4047 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -198,6 +198,13 @@ if [ "$CONFIG_LOAD" != "yes" ];then
       echo
 fi
 
+if [ -z "$ACTIVEMQ_OPTS" ] ; then
+    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY 
-Djava.util.logging.config.file=logging.properties 
-Djava.security.auth.login.config=\"$ACTIVEMQ_CONF\"/login.config"
+fi
+
+
+
+
 # ------------------------------------------------------------------------
 # OS SPECIFIC SUPPORT
 
diff --git a/assembly/src/release/bin/setenv b/assembly/src/release/bin/setenv
index 17e927f94..87c262499 100644
--- a/assembly/src/release/bin/setenv
+++ b/assembly/src/release/bin/setenv
@@ -33,7 +33,9 @@
 if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
     ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
 fi
-ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY $ACTIVEMQ_OPTS 
-Djava.util.logging.config.file=logging.properties 
-Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
+if [ -z "$ACTIVEMQ_OPTS" ] ; then
+    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY 
-Djava.util.logging.config.file=logging.properties 
-Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
+fi
 
 if [ -z "$ACTIVEMQ_OUT" ]; then
    ACTIVEMQ_OUT="/dev/null"