This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 8796568 [KARAF-6917] Remove -Dcom.sun.management.jmxremote by default
8796568 is described below
commit 87965687a26ebce0455a379263e9b43cf237d92c
Author: jbonofre <[email protected]>
AuthorDate: Tue Dec 15 17:37:03 2020 +0100
[KARAF-6917] Remove -Dcom.sun.management.jmxremote by default
(cherry picked from commit a366a772a36eff9a6c064f30dc0f4d84071812f6)
---
.../features/base/src/main/filtered-resources/resources/bin/inc | 3 ++-
.../base/src/main/filtered-resources/resources/bin/karaf.bat | 2 +-
.../java/org/apache/karaf/instance/command/RestartCommand.java | 2 +-
.../main/java/org/apache/karaf/instance/command/StartCommand.java | 2 +-
.../apache/karaf/instance/core/internal/InstanceServiceImpl.java | 2 +-
.../apache/karaf/instance/core/internal/InstancesMBeanImpl.java | 2 +-
manual/src/main/asciidoc/user-guide/monitoring.adoc | 8 --------
manual/src/main/asciidoc/user-guide/os-integration.adoc | 7 +++----
.../apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf | 5 ++---
.../apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf | 5 ++---
.../karaf/wrapper/internal/windows/karaf-wrapper-java11.conf | 5 ++---
.../karaf/wrapper/internal/windows/karaf-wrapper-java8.conf | 5 ++---
.../karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf | 5 ++---
.../karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf | 5 ++---
14 files changed, 22 insertions(+), 36 deletions(-)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
index 44164de8b..2fc743d 100755
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -266,7 +266,8 @@ setupDebugOptions() {
setupVendorSepcifics() {
#Set the JVM_VENDOR specific JVM flags
if [ "${JVM_VENDOR}" = "SUN" ]; then
- JAVA_VENDOR_OPTS="-Dcom.sun.management.jmxremote"
+ #JAVA_VENDOR_OPTS="-Dcom.sun.management.jmxremote"
+ JAVA_VENDOR_OPTS=""
elif [ "${JVM_VENDOR}" = "IBM" ]; then
if ${os400}; then
JAVA_VENDOR_OPTS=
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index fce5031..556df79 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++
b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -268,7 +268,7 @@ if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
echo For more details see
http://java.sun.com/products/hotspot/whitepaper.html#client
)
)
-set DEFAULT_JAVA_OPTS=-Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM%
-Dcom.sun.management.jmxremote -XX:+UnlockDiagnosticVMOptions
+set DEFAULT_JAVA_OPTS=-Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM%
-XX:+UnlockDiagnosticVMOptions
if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
diff --git
a/instance/src/main/java/org/apache/karaf/instance/command/RestartCommand.java
b/instance/src/main/java/org/apache/karaf/instance/command/RestartCommand.java
index 5c31483..78e7352 100644
---
a/instance/src/main/java/org/apache/karaf/instance/command/RestartCommand.java
+++
b/instance/src/main/java/org/apache/karaf/instance/command/RestartCommand.java
@@ -43,7 +43,7 @@ public class RestartCommand extends InstanceCommandSupport {
private List<String> instances = null;
static final String DEBUG_OPTS = " -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005";
- static final String DEFAULT_OPTS = "-server -Xmx512M
-Dcom.sun.management.jmxremote";
+ static final String DEFAULT_OPTS = "-server -Xmx512m";
@SuppressWarnings("deprecation")
protected Object doExecute() throws Exception {
diff --git
a/instance/src/main/java/org/apache/karaf/instance/command/StartCommand.java
b/instance/src/main/java/org/apache/karaf/instance/command/StartCommand.java
index 4c396d9..985ef1e 100644
--- a/instance/src/main/java/org/apache/karaf/instance/command/StartCommand.java
+++ b/instance/src/main/java/org/apache/karaf/instance/command/StartCommand.java
@@ -46,7 +46,7 @@ public class StartCommand extends InstanceCommandSupport {
private List<String> instances = null;
static final String DEBUG_OPTS = " -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005";
- static final String DEFAULT_OPTS = "-server -Xmx512M
-Dcom.sun.management.jmxremote";
+ static final String DEFAULT_OPTS = "-server -Xmx512m";
@SuppressWarnings("deprecation")
protected Object doExecute() throws Exception {
diff --git
a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index 9a9489d..0176f42 100644
---
a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++
b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -87,7 +87,7 @@ public class InstanceServiceImpl implements InstanceService {
private static final String DEFAULT_SHUTDOWN_COMMAND = "SHUTDOWN";
- public static final String DEFAULT_JAVA_OPTS = "-Xmx512M
-Dcom.sun.management.jmxremote -XX:+UnlockDiagnosticVMOptions";
+ public static final String DEFAULT_JAVA_OPTS = "-Xmx512m
-XX:+UnlockDiagnosticVMOptions";
private LinkedHashMap<String, InstanceImpl> proxies = new
LinkedHashMap<>();
diff --git
a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
index 62cedc9..ee0716f 100644
---
a/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
+++
b/instance/src/main/java/org/apache/karaf/instance/core/internal/InstancesMBeanImpl.java
@@ -32,7 +32,7 @@ import org.apache.karaf.instance.core.InstancesMBean;
public class InstancesMBeanImpl extends StandardMBean implements
InstancesMBean {
static final String DEBUG_OPTS = " -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005";
- static final String DEFAULT_OPTS = "-server -Xmx512M
-Dcom.sun.management.jmxremote";
+ static final String DEFAULT_OPTS = "-server -Xmx512m";
private org.apache.karaf.instance.core.InstanceService instanceService;
diff --git a/manual/src/main/asciidoc/user-guide/monitoring.adoc
b/manual/src/main/asciidoc/user-guide/monitoring.adoc
index a608f9a..6c7fb70 100644
--- a/manual/src/main/asciidoc/user-guide/monitoring.adoc
+++ b/manual/src/main/asciidoc/user-guide/monitoring.adoc
@@ -32,14 +32,6 @@ The JMX URL to use by default is:
service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-root
----
-If you don't need the remote JMX at all, users can remove
-
-----
--Dcom.sun.management.jmxremote
-----
-
-from bin/karaf|bin/karaf.bat to avoid opening the RMI listening port.
-
You have to provide an username and password to access the JMX layer.
The JMX layer uses the security framework, and so, by default, it uses the
users defined in `etc/users.properties`.
diff --git a/manual/src/main/asciidoc/user-guide/os-integration.adoc
b/manual/src/main/asciidoc/user-guide/os-integration.adoc
index b7189de..ed6a164 100644
--- a/manual/src/main/asciidoc/user-guide/os-integration.adoc
+++ b/manual/src/main/asciidoc/user-guide/os-integration.adoc
@@ -288,10 +288,9 @@ wrapper.java.additional.1=-Dkaraf.home=%KARAF_HOME%
wrapper.java.additional.2=-Dkaraf.base=%KARAF_BASE%
wrapper.java.additional.3=-Dkaraf.data=%KARAF_DATA%
wrapper.java.additional.4=-Dkaraf.etc=%KARAF_ETC%
-wrapper.java.additional.5=-Dcom.sun.management.jmxremote
-wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.8=-Djava.io.tmpdir=%KARAF_DATA%/tmp
+wrapper.java.additional.5=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.6=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.7=-Djava.io.tmpdir=%KARAF_DATA%/tmp
# Uncomment if you need libraries on Java 8
#wrapper.java.additional.9=-Djava.endorsed.dirs=%JAVA_HOME%/jre/lib/endorsed:%JAVA_HOME%/lib/endorsed:%KARAF_HOME%/lib/endorsed
#wrapper.java.additional.10=-Djava.ext.dirs=%JAVA_HOME%/jre/lib/ext:%JAVA_HOME%/lib/ext:%KARAF_HOME%/lib/ext
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
index 6952dfe..f792326 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
@@ -55,9 +55,8 @@ wrapper.java.additional.6=-Dkaraf.log=%KARAF_LOG%
wrapper.java.additional.7=-Dkaraf.restart.jvm.supported=true
wrapper.java.additional.8=-Djava.io.tmpdir=%KARAF_DATA%/tmp
wrapper.java.additional.9=-Djava.util.logging.config.file=%KARAF_ETC%/java.util.logging.properties
-wrapper.java.additional.10=-Dcom.sun.management.jmxremote
-wrapper.java.additional.11=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.12=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.10=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.11=-Dkaraf.startRemoteShell=true
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
index 349a2ed..9aa4736 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
@@ -53,9 +53,8 @@ wrapper.java.additional.8=-Dkaraf.log=%KARAF_LOG%
wrapper.java.additional.9=-Dkaraf.restart.jvm.supported=true
wrapper.java.additional.10=-Djava.io.tmpdir=%KARAF_DATA%/tmp
wrapper.java.additional.11=-Djava.util.logging.config.file=%KARAF_ETC%/java.util.logging.properties
-wrapper.java.additional.12=-Dcom.sun.management.jmxremote
-wrapper.java.additional.13=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.14=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.12=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.13=-Dkaraf.startRemoteShell=true
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
index 7d2c722..c28e15b 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
@@ -55,9 +55,8 @@ wrapper.java.additional.6=-Dkaraf.log="%KARAF_LOG%"
wrapper.java.additional.7=-Dkaraf.restart.jvm.supported=true
wrapper.java.additional.8=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
wrapper.java.additional.9=-Djava.util.logging.config.file="%KARAF_ETC%/java.util.logging.properties"
-wrapper.java.additional.10=-Dcom.sun.management.jmxremote
-wrapper.java.additional.11=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.12=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.10=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.11=-Dkaraf.startRemoteShell=true
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
index fdfd7db..7af7a79 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
@@ -53,9 +53,8 @@ wrapper.java.additional.8=-Dkaraf.log="%KARAF_LOG%"
wrapper.java.additional.9=-Dkaraf.restart.jvm.supported=true
wrapper.java.additional.10=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
wrapper.java.additional.11=-Djava.util.logging.config.file="%KARAF_ETC%/java.util.logging.properties"
-wrapper.java.additional.12=-Dcom.sun.management.jmxremote
-wrapper.java.additional.13=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.14=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.12=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.13=-Dkaraf.startRemoteShell=true
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
index d5a4534..0ab19c3 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
@@ -55,9 +55,8 @@ wrapper.java.additional.6=-Dkaraf.log="%KARAF_LOG%"
wrapper.java.additional.7=-Dkaraf.restart.jvm.supported=true
wrapper.java.additional.8=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
wrapper.java.additional.9=-Djava.util.logging.config.file="%KARAF_BASE%/etc/java.util.logging.properties"
-wrapper.java.additional.10=-Dcom.sun.management.jmxremote
-wrapper.java.additional.11=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.12=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.10=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.11=-Dkaraf.startRemoteShell=true
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
diff --git
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
index fdfd7db..7af7a79 100644
---
a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
+++
b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
@@ -53,9 +53,8 @@ wrapper.java.additional.8=-Dkaraf.log="%KARAF_LOG%"
wrapper.java.additional.9=-Dkaraf.restart.jvm.supported=true
wrapper.java.additional.10=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
wrapper.java.additional.11=-Djava.util.logging.config.file="%KARAF_ETC%/java.util.logging.properties"
-wrapper.java.additional.12=-Dcom.sun.management.jmxremote
-wrapper.java.additional.13=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.14=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.12=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.13=-Dkaraf.startRemoteShell=true
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
