You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/04/13 16:44:46 UTC
[1/2] karaf git commit: [KARAF-5094] Remove the VM option -server
Repository: karaf
Updated Branches:
refs/heads/master 442b5024d -> 29d0d2ab4
[KARAF-5094] Remove the VM option -server
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/06eb7aac
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/06eb7aac
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/06eb7aac
Branch: refs/heads/master
Commit: 06eb7aac6af91342f76db59f30668b14591f4626
Parents: 442b502
Author: earcam <Caspar MacRae earcam@gmail.com>
Authored: Thu Apr 13 16:54:14 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Apr 13 18:43:42 2017 +0200
----------------------------------------------------------------------
.../features/base/src/main/filtered-resources/resources/bin/inc | 2 +-
.../base/src/main/filtered-resources/resources/bin/karaf.bat | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/06eb7aac/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
----------------------------------------------------------------------
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 4453de3..a79841b 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -274,7 +274,7 @@ setupDefaults() {
DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS} -XX:MaxPermSize=${JAVA_MAX_PERM_MEM}"
fi
fi
- DEFAULT_JAVA_OPTS="-server ${DEFAULT_JAVA_OPTS} -Dcom.sun.management.jmxremote"
+ DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS} -Dcom.sun.management.jmxremote"
elif [ "${JVM_VENDOR}" = "IBM" ]; then
if ${os400}; then
DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS}"
http://git-wip-us.apache.org/repos/asf/karaf/blob/06eb7aac/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
----------------------------------------------------------------------
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 fec2f30..91321b9 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
@@ -96,7 +96,6 @@ if "%KARAF_ETC%" == "" (
)
set LOCAL_CLASSPATH=%CLASSPATH%
-set JAVA_MODE=-server
set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf
set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
@@ -235,10 +234,9 @@ if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
echo WARNING: Running Karaf on a Java HotSpot Client VM because server-mode is not available.
echo Install Java Developer Kit to fix this.
echo For more details see http://java.sun.com/products/hotspot/whitepaper.html#client
- set JAVA_MODE=-client
)
)
-set DEFAULT_JAVA_OPTS=%JAVA_MODE% -Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -Dcom.sun.management.jmxremote -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass
+set DEFAULT_JAVA_OPTS=-Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -Dcom.sun.management.jmxremote -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass
rem Check some easily accessible MIN/MAX params for JVM mem usage
if not "%JAVA_PERM_MEM%" == "" (
[2/2] karaf git commit: [KARAF-5094] This closes #294
Posted by jb...@apache.org.
[KARAF-5094] This closes #294
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/29d0d2ab
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/29d0d2ab
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/29d0d2ab
Branch: refs/heads/master
Commit: 29d0d2ab4bc23c864cbbf0ca2c5c32a8007939f4
Parents: 442b502 06eb7aa
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Apr 13 18:44:40 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Apr 13 18:44:40 2017 +0200
----------------------------------------------------------------------
.../features/base/src/main/filtered-resources/resources/bin/inc | 2 +-
.../base/src/main/filtered-resources/resources/bin/karaf.bat | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------