make JMX port configurable

Author: yannick

src/distribution/bin/diagnostics.bat

@@ -65,7 +65,8 @@ rem  limitations under the License.
   set "JAVA_OPTS=%JAVA_OPTS% --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/sun.security.provider=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports java.base/jdk.internal.misc=ALL-UNNAMED"
 
   rem JMX Monitoring
-  set "JAVA_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false %JAVA_OPTS%"
+  IF NOT DEFINED HIVEMQ_JMX_PORT SET "HIVEMQ_JMX_PORT=9010"
+  set "JAVA_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=%HIVEMQ_JMX_PORT% -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false %JAVA_OPTS%"
 
   set "JAVA_OPTS=-DdiagnosticMode=true %JAVA_OPTS%"
 
@@ -128,4 +129,4 @@ GOTO :EOF
 
 :RESOLVE
 SET %2=%~f1
-GOTO :EOF
+GOTO :EOF

src/distribution/bin/diagnostics.sh

@@ -54,7 +54,7 @@ if hash java 2>/dev/null; then
     fi
 
     # JMX Monitoring
-    JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+    JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=${JMX_PORT:-9010} -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 
     JAVA_OPTS="$JAVA_OPTS -DdiagnosticMode=true"
 

src/distribution/bin/run.bat

@@ -65,7 +65,8 @@ rem  limitations under the License.
 
 
   rem JMX Monitoring
-  set "JAVA_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false %JAVA_OPTS%"
+  IF NOT DEFINED HIVEMQ_JMX_PORT SET "HIVEMQ_JMX_PORT=9010"
+  set "JAVA_OPTS=-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=%HIVEMQ_JMX_PORT% -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false %JAVA_OPTS%"
 
   rem Uncomment for enabling diagnostic mode
   rem set "JAVA_OPTS=-DdiagnosticMode=true %JAVA_OPTS%"
@@ -128,4 +129,4 @@ GOTO :EOF
 
 :RESOLVE
 SET %2=%~f1
-GOTO :EOF
+GOTO :EOF

src/distribution/bin/run.sh

@@ -52,7 +52,7 @@ if hash java 2>/dev/null; then
     fi
 
     # JMX Monitoring
-    JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
+    JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=${JMX_PORT:-9010} -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 
     # Uncomment for enabling Diagnostic Mode
     #JAVA_OPTS="$JAVA_OPTS -DdiagnosticMode=true"