Repository: karaf Updated Branches: refs/heads/karaf-2.x 4b310a8e7 -> 8eb52203e
[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/8eb52203 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8eb52203 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8eb52203 Branch: refs/heads/karaf-2.x Commit: 8eb52203e74fa8a7cf2335861fcd4623779f9ec8 Parents: 4b310a8 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Dec 25 18:41:01 2014 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Dec 25 18:41:01 2014 +0100 ---------------------------------------------------------------------- .../apache-karaf/src/main/distribution/unix-shell/bin/karaf | 7 ++++++- .../src/main/distribution/windows-text/bin/karaf.bat | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/admin | 7 ++++++- .../apache-karaf/src/main/filtered-resources/bin/admin.bat | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/shell | 6 +++++- .../apache-karaf/src/main/filtered-resources/bin/shell.bat | 2 +- 6 files changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/8eb52203/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf index 7d001ee..5367061 100755 --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf @@ -298,7 +298,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/8eb52203/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat b/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat index 3da4675..81bebc6 100755 --- a/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat +++ b/assemblies/apache-karaf/src/main/distribution/windows-text/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 http://git-wip-us.apache.org/repos/asf/karaf/blob/8eb52203/assemblies/apache-karaf/src/main/filtered-resources/bin/admin ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin index dc708a1..cb25f60 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin @@ -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/8eb52203/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat index 19e9684..99ba6a1 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.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/8eb52203/assemblies/apache-karaf/src/main/filtered-resources/bin/shell ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell index 179eabc..fdfb573 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell @@ -278,7 +278,11 @@ setupDefaults() { CLASSPATH="$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar" CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/ops4j/pax/logging/pax-logging-api/${pax.logging.version}/pax-logging-api-${pax.logging.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/8eb52203/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat index 0404eec..ccca789 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat +++ b/assemblies/apache-karaf/src/main/filtered-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
