(activemq) branch activemq-6.0.x updated: 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 f761b6598 AMQ-9460: Don't override ACTIVEMQ_OPTS when provided by user
f761b6598 is described below

commit f761b6598ef91458e56a6b873ea9f753e1333e07
Author: JB Onofré <jbono...@apache.org>
AuthorDate: Sun Mar 31 19:01:08 2024 +0200

    AMQ-9460: Don't override ACTIVEMQ_OPTS when provided by user
    
    (cherry picked from commit 34e228f14c01ba9c029369d4360ca02b3896dd98)
---
 assembly/src/docker/Dockerfile    | 2 +-
 assembly/src/release/bin/activemq | 7 -------
 assembly/src/release/bin/setenv   | 4 +---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/assembly/src/docker/Dockerfile b/assembly/src/docker/Dockerfile
index 819b64c11..596265c5e 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 $ACTIVEMQ_OPTS -Djetty.host=0.0.0.0
+ENV 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 8a51f4047..720cd0e58 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -198,13 +198,6 @@ 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 87c262499..17e927f94 100644
--- a/assembly/src/release/bin/setenv
+++ b/assembly/src/release/bin/setenv
@@ -33,9 +33,7 @@
 if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
     ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
 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
+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_OUT" ]; then
    ACTIVEMQ_OUT="/dev/null"