merge bug19020 into default

Author: Matthias Radestock

scripts/runjava.bat

@@ -3,7 +3,7 @@
 setlocal EnableDelayedExpansion
 
 set CP=
-for %%F in (*.jar) do set CP=!CP!;%%F
+for %%F in ("%~dp0"/*.jar) do set CP=!CP!;%%F
 
 java -cp %CP% %1 %2 %3 %4 %5 %6 %7 %8 %9
 

scripts/runjava.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 RABBIT_JARS=
-for d in *.jar
+for d in `dirname $0`/*.jar
 do
     RABBIT_JARS="$d:$RABBIT_JARS"
 done
-exec java -cp "$RABBIT_JARS" "$@"
+exec java -cp "$RABBIT_JARS" "$@"