Repository: karaf Updated Branches: refs/heads/karaf-3.0.x ba2a904f8 -> c0db8337a
[KARAF-3421] Introduce JAVA_DEBUG_PORT variable to easily change the debug port number [KARAF-3420] Use Java6 like debug JVM argument Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c0db8337 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c0db8337 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c0db8337 Branch: refs/heads/karaf-3.0.x Commit: c0db8337af4a995cb2337a04bba5b0fe222b126e Parents: ba2a904 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Dec 25 17:56:05 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Dec 25 18:15:16 2014 +0100 ---------------------------------------------------------------------- .../src/main/filtered-resources/resources/bin/instance | 7 ++++++- .../src/main/filtered-resources/resources/bin/instance.bat | 2 +- .../framework/src/main/filtered-resources/resources/bin/shell | 6 +++++- .../src/main/filtered-resources/resources/bin/shell.bat | 2 +- .../features/framework/src/main/resources/resources/bin/karaf | 7 ++++++- .../framework/src/main/resources/resources/bin/karaf.bat | 2 +- 6 files changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/c0db8337/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance index 69b10d2..4eccf6f 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance @@ -284,7 +284,12 @@ setupDefaults() { CLASSPATH="$CLASSPATH:$file" fi done - DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" + + DEFAULT_JAVA_DEBUG_PORT="5005" + if [ "x$JAVA_DEBUG_PORT" = "x" ]; then + JAVA_DEBUG_PORT="$DEFAULT_JAVA_DEBUG_PORT" + fi + DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$JAVA_DEBUG_PORT" ## ## TODO: Move to conf/profiler/yourkit.{sh|cmd} http://git-wip-us.apache.org/repos/asf/karaf/blob/c0db8337/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat index e502677..7f39365 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat @@ -95,7 +95,7 @@ if "%KARAF_ETC%" == "" ( ) set DEFAULT_JAVA_OPTS= -set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 +set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 rem Support for loading native libraries set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib http://git-wip-us.apache.org/repos/asf/karaf/blob/c0db8337/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell index 05b68a5..8b73e63 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell @@ -280,7 +280,11 @@ setupDefaults() { CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.version}.jar" CLASSPATH="$CLASSPATH:$KARAF_HOME/system/jline/jline/${jline.version}/jline-${jline.version}.jar" - DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" + DEFAULT_JAVA_DEBUG_PORT="5005" + if [ "x$JAVA_DEBUG_PORT" = "x" ]; then + JAVA_DEBUG_PORT="$DEFAULT_JAVA_DEBUG_PORT" + fi + DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$JAVA_DEBUG_PORT" ## ## TODO: Move to conf/profiler/yourkit.{sh|cmd} http://git-wip-us.apache.org/repos/asf/karaf/blob/c0db8337/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat index 71a9166..91135c1 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat @@ -95,7 +95,7 @@ if "%KARAF_ETC%" == "" ( ) set DEFAULT_JAVA_OPTS= -set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 +set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 rem Support for loading native libraries set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib http://git-wip-us.apache.org/repos/asf/karaf/blob/c0db8337/assemblies/features/framework/src/main/resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/bin/karaf b/assemblies/features/framework/src/main/resources/resources/bin/karaf index 15b2d28..8d53ee1 100755 --- a/assemblies/features/framework/src/main/resources/resources/bin/karaf +++ b/assemblies/features/framework/src/main/resources/resources/bin/karaf @@ -308,7 +308,12 @@ setupDefaults() { CLASSPATH="$CLASSPATH:$file" fi done - DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" + + DEFAULT_JAVA_DEBUG_PORT="5005" + if [ "x$JAVA_DEBUG_PORT" = "x" ]; then + JAVA_DEBUG_PORT="$DEFAULT_JAVA_DEBUG_PORT" + fi + DEFAULT_JAVA_DEBUG_OPTS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$JAVA_DEBUG_PORT" ## ## TODO: Move to conf/profiler/yourkit.{sh|cmd} http://git-wip-us.apache.org/repos/asf/karaf/blob/c0db8337/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat b/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat index c650fcb..23add97 100644 --- a/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat +++ b/assemblies/features/framework/src/main/resources/resources/bin/karaf.bat @@ -98,7 +98,7 @@ set LOCAL_CLASSPATH=%CLASSPATH% set JAVA_MODE=-server set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf -set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 +set DEFAULT_JAVA_DEBUG_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 if "%LOCAL_CLASSPATH%" == "" goto :KARAF_CLASSPATH_EMPTY set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf
