reorder java opts so we can actually override defaults
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9ec4442c Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9ec4442c Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9ec4442c Branch: refs/heads/master Commit: 9ec4442c6c0d12e697459767173092b40ef6c7ae Parents: f57ac3d Author: Jonathan Anstey <[email protected]> Authored: Tue Sep 9 13:29:59 2014 -0230 Committer: Jonathan Anstey <[email protected]> Committed: Tue Sep 9 13:30:45 2014 -0230 ---------------------------------------------------------------------- .../framework/src/main/filtered-resources/resources/bin/client.bat | 2 +- .../framework/src/main/filtered-resources/resources/bin/instance | 2 +- .../src/main/filtered-resources/resources/bin/instance.bat | 2 +- .../framework/src/main/filtered-resources/resources/bin/karaf | 2 +- .../framework/src/main/filtered-resources/resources/bin/karaf.bat | 2 +- .../framework/src/main/filtered-resources/resources/bin/shell | 2 +- .../framework/src/main/filtered-resources/resources/bin/shell.bat | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9ec4442c/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat index 7153c2a..d4ad40f 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat @@ -112,7 +112,7 @@ if not "%JAVA%" == "" goto :Check_JAVA_END if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END - set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%" + set JAVA_OPTS="%JAVA_OPTS% %EXTRA_JAVA_OPTS%" :KARAF_EXTRA_JAVA_OPTS_END set CLASSPATH=%KARAF_HOME%\lib\bin\karaf-client.jar http://git-wip-us.apache.org/repos/asf/karaf/blob/9ec4442c/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 1a03c5e..6727edf 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance @@ -235,7 +235,7 @@ setupDebugOptions() { export JAVA_OPTS if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then - JAVA_OPTS="$EXTRA_JAVA_OPTS $JAVA_OPTS" + JAVA_OPTS="$JAVA_OPTS $EXTRA_JAVA_OPTS" fi # Set Debug options if enabled http://git-wip-us.apache.org/repos/asf/karaf/blob/9ec4442c/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 a52915c..0fc928b 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 @@ -114,7 +114,7 @@ if not "%JAVA%" == "" goto :Check_JAVA_END if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END - set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%" + set JAVA_OPTS="%JAVA_OPTS% %EXTRA_JAVA_OPTS%" :KARAF_EXTRA_JAVA_OPTS_END if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END http://git-wip-us.apache.org/repos/asf/karaf/blob/9ec4442c/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf index 00a0770..a2d6f37 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf @@ -252,7 +252,7 @@ setupDebugOptions() { export JAVA_OPTS if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then - JAVA_OPTS="$EXTRA_JAVA_OPTS $JAVA_OPTS" + JAVA_OPTS="$JAVA_OPTS $EXTRA_JAVA_OPTS" fi # Set Debug options if enabled http://git-wip-us.apache.org/repos/asf/karaf/blob/9ec4442c/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat index aff0c19..58a5369 100644 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat @@ -232,7 +232,7 @@ set DEFAULT_JAVA_OPTS=%JAVA_MODE% -Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -Dderby. if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END - set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%" + set JAVA_OPTS="%JAVA_OPTS% %EXTRA_JAVA_OPTS%" :KARAF_EXTRA_JAVA_OPTS_END if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END http://git-wip-us.apache.org/repos/asf/karaf/blob/9ec4442c/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 e733d2f..1d8b8b0 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell @@ -235,7 +235,7 @@ setupDebugOptions() { export JAVA_OPTS if [ "x$EXTRA_JAVA_OPTS" != "x" ]; then - JAVA_OPTS="$EXTRA_JAVA_OPTS $JAVA_OPTS" + JAVA_OPTS="$JAVA_OPTS $EXTRA_JAVA_OPTS" fi # Set Debug options if enabled http://git-wip-us.apache.org/repos/asf/karaf/blob/9ec4442c/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 bae846e..a7acf59 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 @@ -114,7 +114,7 @@ if not "%JAVA%" == "" goto :Check_JAVA_END if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS% if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END - set JAVA_OPTS="%EXTRA_JAVA_OPTS% %JAVA_OPTS%" + set JAVA_OPTS="%JAVA_OPTS% %EXTRA_JAVA_OPTS%" :KARAF_EXTRA_JAVA_OPTS_END if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
