Author: jbonofre
Date: Wed Jun 13 06:50:29 2012
New Revision: 1349656
URL: http://svn.apache.org/viewvc?rev=1349656&view=rev
Log:
[KARAF-1410] Fix error in client and stop script when debug is enabled
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1349656&r1=1349655&r2=1349656&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
Wed Jun 13 06:50:29 2012
@@ -40,6 +40,13 @@ if [ "x$JAVA_MAX_MEM" = "x" ]; then
export JAVA_MAX_MEM
fi
+#
+# Check the mode that initiated the script
+#
+if [ "x$1" != "x" ]; then
+ MODE=$1
+fi
+
warn() {
echo "${PROGNAME}: $*"
}
@@ -227,6 +234,13 @@ setupDebugOptions() {
# Set Debug options if enabled
if [ "x$KARAF_DEBUG" != "x" ]; then
+ # Ignore DEBUG in case of stop or client mode
+ if [ "x$MODE" = "xstop" ]; then
+ return
+ fi
+ if [ "x$MODE" = "xclient" ]; then
+ return
+ fi
# Use the defaults if JAVA_DEBUG_OPTS was not set
if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat?rev=1349656&r1=1349655&r2=1349656&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
Wed Jun 13 06:50:29 2012
@@ -194,6 +194,8 @@ if not "%JAVA%" == "" goto :Check_JAVA_E
if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
+ if "%1" == "stop" goto :KARAF_DEBUG_END
+ if "%1" == "client" goto :KARAF_DEBUG_END
rem Use the defaults if JAVA_DEBUG_OPTS was not set
if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client?rev=1349656&r1=1349655&r2=1349656&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client
Wed Jun 13 06:50:29 2012
@@ -219,24 +219,6 @@ detectJVM() {
# echo "JVM vendor is $JVM_VENDOR"
}
-setupDebugOptions() {
- if [ "x$JAVA_OPTS" = "x" ]; then
- JAVA_OPTS="$DEFAULT_JAVA_OPTS"
- fi
- export JAVA_OPTS
-
- # Set Debug options if enabled
- if [ "x$KARAF_DEBUG" != "x" ]; then
- # Use the defaults if JAVA_DEBUG_OPTS was not set
- if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
- JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
- fi
-
- JAVA_OPTS="$JAVA_DEBUG_OPTS $JAVA_OPTS"
- warn "Enabling Java debug options: $JAVA_DEBUG_OPTS"
- fi
-}
-
setupDefaults() {
DEFAULT_JAVA_OPTS="-Xms$JAVA_MIN_MEM -Xmx$JAVA_MAX_MEM "
@@ -268,13 +250,6 @@ setupDefaults() {
CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/mina/mina-core/${mina.version}/mina-core-${mina.version}.jar"
CLASSPATH="$CLASSPATH:$KARAF_HOME/system/org/apache/karaf/shell/org.apache.karaf.shell.console/${project.version}/org.apache.karaf.shell.console-${project.version}.jar"
- DEFAULT_JAVA_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
-
- ##
- ## TODO: Move to conf/profiler/yourkit.{sh|cmd}
- ##
- # Uncomment to enable YourKit profiling
- #DEFAULT_JAVA_DEBUG_OPTS="-Xrunyjpagent"
}
init() {
@@ -305,9 +280,6 @@ init() {
# Setup default options
setupDefaults
- # Install debug options
- setupDebugOptions
-
}
run() {
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat?rev=1349656&r1=1349655&r2=1349656&view=diff
==============================================================================
---
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
(original)
+++
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
Wed Jun 13 06:50:29 2012
@@ -85,7 +85,6 @@ if "%KARAF_DATA%" == "" (
)
set DEFAULT_JAVA_OPTS=
-set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
rem Support for loading native libraries
set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib
@@ -103,14 +102,6 @@ if not "%JAVA%" == "" goto :Check_JAVA_E
if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
-if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
- rem Use the defaults if JAVA_DEBUG_OPTS was not set
- if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
-
- set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%"
- call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
-:KARAF_DEBUG_END
-
set CLASSPATH=%KARAF_HOME%\lib\bin\karaf-client.jar
set
CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\sshd\sshd-core\${sshd.version}\sshd-core-${sshd.version}.jar
set
CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\org\apache\mina\mina-core\${mina.version}\mina-core-${mina.version}.jar
