Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 25bd8c350 -> fa286d31b
KARAF-4282 - Define karaf.data in bin/shell Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/fa286d31 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/fa286d31 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/fa286d31 Branch: refs/heads/karaf-3.0.x Commit: fa286d31b96ee80bd9dc45d4388e16223001ecfb Parents: 25bd8c3 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Jan 24 07:24:49 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Jan 24 07:24:49 2016 +0100 ---------------------------------------------------------------------- .../framework/src/main/filtered-resources/resources/bin/shell | 2 +- .../framework/src/main/filtered-resources/resources/bin/shell.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/fa286d31/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 acbf726..0b421f3 100755 --- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell +++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell @@ -343,7 +343,7 @@ run() { fi fi - exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.impl.Main --classpath="$KARAF_HOME/system" "$@" + exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.etc="$KARAF_ETC" -Dkaraf.data="$KARAF_DATA" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.impl.Main --classpath="$KARAF_HOME/system" "$@" } main() { http://git-wip-us.apache.org/repos/asf/karaf/blob/fa286d31/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 91135c1..e909b4d 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 @@ -133,7 +133,7 @@ set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\system\jline\jline\${jline.version}\jline if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8 if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8 rem Execute the Java Virtual Machine - "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Dkaraf.etc="%KARAF_ETC%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.shell.console.impl.Main --classpath="%KARAF_HOME%\system" %ARGS% + "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Dkaraf.etc="%KARAF_ETC%" -Dkaraf.data="%KARAF_DATA%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.shell.console.impl.Main --classpath="%KARAF_HOME%\system" %ARGS% rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
