You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/09/09 18:01:28 UTC
git commit: reorder java opts so we can actually override defaults
Repository: karaf
Updated Branches:
refs/heads/karaf-2.x c3fb61914 -> 96247872d
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/96247872
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/96247872
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/96247872
Branch: refs/heads/karaf-2.x
Commit: 96247872da2ca5e9a439f2d49088f5712cc40a84
Parents: c3fb619
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Tue Sep 9 09:47:34 2014 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Tue Sep 9 13:31:17 2014 -0230
----------------------------------------------------------------------
assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf | 2 +-
.../apache-karaf/src/main/distribution/windows-text/bin/karaf.bat | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/admin | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/shell | 2 +-
assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/96247872/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 b8687d2..0be8898 100755
--- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
+++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
@@ -242,7 +242,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/96247872/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 69b46a6..45240b5 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
@@ -233,7 +233,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/96247872/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 bcf6cf0..6786bc3 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
@@ -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/96247872/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 3572f41..19e9684 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin.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/96247872/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat b/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
index 40b4ecd..c85b137 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat
@@ -113,7 +113,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/96247872/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 330631a..86b8560 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
@@ -234,7 +234,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/96247872/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 b444038..69d4700 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat
+++ b/assemblies/apache-karaf/src/main/filtered-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