You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2010/12/31 20:23:17 UTC
svn commit: r1054162 - in /karaf/trunk/assembly/src/main:
distribution/unix-shell/bin/ distribution/windows-text/bin/
filtered-resources/bin/
Author: pieber
Date: Fri Dec 31 19:23:16 2010
New Revision: 1054162
URL: http://svn.apache.org/viewvc?rev=1054162&view=rev
Log:
[KARAF-350] provide KARAF_OPTS for additional configurations using export or set on the cmd
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
karaf/trunk/assembly/src/main/filtered-resources/bin/admin
karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat
karaf/trunk/assembly/src/main/filtered-resources/bin/client
karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat
karaf/trunk/assembly/src/main/filtered-resources/bin/shell
karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat
Modified: karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf?rev=1054162&r1=1054161&r2=1054162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf (original)
+++ karaf/trunk/assembly/src/main/distribution/unix-shell/bin/karaf Fri Dec 31 19:23:16 2010
@@ -338,7 +338,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
cd "$KARAF_BASE"
- exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed" -Djava.ext.dirs="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $OPTS -classpath "$CLASSPATH" $MAIN "$@"
+ exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed" -Djava.ext.dirs="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN "$@"
}
main() {
Modified: karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat?rev=1054162&r1=1054161&r2=1054162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat (original)
+++ karaf/trunk/assembly/src/main/distribution/windows-text/bin/karaf.bat Fri Dec 31 19:23:16 2010
@@ -246,7 +246,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
cd %KARAF_BASE%
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Djava.endorsed.dirs="%JAVA_HOME%\jre\lib\endorsed;%JAVA_HOME%\lib\endorsed;%KARAF_HOME%\lib\endorsed" -Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%JAVA_HOME%\lib\ext;%KARAF_HOME%\lib\ext" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Dkaraf.data="%KARAF_DATA%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %MAIN% %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Djava.endorsed.dirs="%JAVA_HOME%\jre\lib\endorsed;%JAVA_HOME%\lib\endorsed;%KARAF_HOME%\lib\endorsed" -Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%JAVA_HOME%\lib\ext;%KARAF_HOME%\lib\ext" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Dkaraf.data="%KARAF_DATA%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% %MAIN% %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/admin
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/admin?rev=1054162&r1=1054161&r2=1054162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/admin (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/admin Fri Dec 31 19:23:16 2010
@@ -302,7 +302,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.karaf.admin.main.Execute "$@"
+ exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.admin.main.Execute "$@"
}
main() {
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat?rev=1054162&r1=1054161&r2=1054162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/admin.bat Fri Dec 31 19:23:16 2010
@@ -87,7 +87,7 @@ set CLASSPATH=%KARAF_HOME%\system\org\ap
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%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" org.apache.karaf.admin.main.Execute %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.admin.main.Execute %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/client?rev=1054162&r1=1054161&r2=1054162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/client (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/client Fri Dec 31 19:23:16 2010
@@ -297,7 +297,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.karaf.client.Main "$@"
+ exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.client.Main "$@"
}
main() {
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat?rev=1054162&r1=1054161&r2=1054162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/client.bat Fri Dec 31 19:23:16 2010
@@ -90,7 +90,7 @@ set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\s
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%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" org.apache.karaf.client.Main %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.client.Main %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/shell
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/shell?rev=1054162&r1=1054161&r2=1054162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/shell (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/shell Fri Dec 31 19:23:16 2010
@@ -295,7 +295,7 @@ run() {
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.Main --classpath=system "$@"
+ exec $JAVA $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.util.logging.config.file=$KARAF_BASE/etc/java.util.logging.properties $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.Main --classpath=system "$@"
}
main() {
Modified: karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat?rev=1054162&r1=1054161&r2=1054162&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/bin/shell.bat Fri Dec 31 19:23:16 2010
@@ -88,7 +88,7 @@ set CLASSPATH=%CLASSPATH#:%KARAF_HOME%\s
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%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" org.apache.karaf.shell.console.Main --classpath=system %ARGS%
+ "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.shell.console.Main --classpath=system %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #