Author: ffang
Date: Thu Oct 22 01:42:18 2009
New Revision: 828279
URL: http://svn.apache.org/viewvc?rev=828279&view=rev
Log:
[FELIX-1793]ensure launch karaf java process from KARAF_BASE folder
Modified:
felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
Modified: felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf?rev=828279&r1=828278&r2=828279&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
(original)
+++ felix/trunk/karaf/assembly/src/main/distribution/unix-shell/bin/karaf Thu
Oct 22 01:42:18 2009
@@ -285,6 +285,7 @@
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
+ cd $KARAF_BASE
exec $JAVA $JAVA_OPTS -Dstorage.location="${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.felix.karaf.main.Bootstrap "$@"
}
Modified:
felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat?rev=828279&r1=828278&r2=828279&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
(original)
+++ felix/trunk/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
Thu Oct 22 01:42:18 2009
@@ -152,6 +152,7 @@
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
+ cd %KARAF_BASE%
"%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%"
-Dstorage.location="%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.felix.karaf.main.Bootstrap %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
