FELIX-1118 - Update shell scripts
- Updated shell scripts, env vars, and other misc items from servicemix to karaf.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@771188 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg b/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
similarity index 94%
rename from karaf/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg
rename to karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
index 98bbd57..0a2eafe 100644
--- a/karaf/assembly/src/main/distribution/text/etc/org.apache.servicemix.shell.cfg
+++ b/karaf/assembly/src/main/distribution/text/etc/org.apache.felix.karaf.shell.cfg
@@ -19,5 +19,5 @@
#
sshPort=8101
-sshRealm=servicemix
-hostKey=${servicemix.base}/etc/host.key
+sshRealm=karaf
+hostKey=${karaf.base}/etc/host.key
diff --git a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
index 24ddea5..eca5c0e 100644
--- a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
+++ b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.logging.cfg
@@ -32,5 +32,5 @@
log4j.appender.out=org.apache.log4j.FileAppender
log4j.appender.out.layout=org.apache.log4j.PatternLayout
log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
-log4j.appender.out.file=${servicemix.base}/data/log/servicemix.log
+log4j.appender.out.file=${karaf.base}/data/log/karaf.log
log4j.appender.out.append=true
diff --git a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
index 6e50c3e..5615941 100644
--- a/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
+++ b/karaf/assembly/src/main/distribution/text/etc/org.ops4j.pax.url.mvn.cfg
@@ -55,7 +55,7 @@
#
# The following property value will add the system folder as a repo.
#
-org.ops4j.pax.url.mvn.defaultRepositories=file:${servicemix.home}/system@snapshots
+org.ops4j.pax.url.mvn.defaultRepositories=file:${karaf.home}/system@snapshots
#
# Comma separated list of repositories scanned when resolving an artifact.
diff --git a/karaf/assembly/src/main/distribution/text/etc/system.properties b/karaf/assembly/src/main/distribution/text/etc/system.properties
index d82ce7c..42f026f 100644
--- a/karaf/assembly/src/main/distribution/text/etc/system.properties
+++ b/karaf/assembly/src/main/distribution/text/etc/system.properties
@@ -18,5 +18,5 @@
################################################################################
org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
-servicemix.name=root
+karaf.name=root
xml.catalog.files=
diff --git a/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix b/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
similarity index 82%
rename from karaf/assembly/src/main/distribution/unix-shell/bin/servicemix
rename to karaf/assembly/src/main/distribution/unix-shell/bin/karaf
index b92e7ef..a5771c9 100755
--- a/karaf/assembly/src/main/distribution/unix-shell/bin/servicemix
+++ b/karaf/assembly/src/main/distribution/unix-shell/bin/karaf
@@ -108,29 +108,29 @@
}
locateHome() {
- if [ "x$SERVICEMIX_HOME" != "x" ]; then
- warn "Ignoring predefined value for SERVICEMIX_HOME"
+ if [ "x$KARAF_HOME" != "x" ]; then
+ warn "Ignoring predefined value for KARAF_HOME"
fi
- SERVICEMIX_HOME=`cd $DIRNAME/..; pwd`
- if [ ! -d "$SERVICEMIX_HOME" ]; then
- die "SERVICEMIX_HOME is not valid: $SERVICEMIX_HOME"
+ KARAF_HOME=`cd $DIRNAME/..; pwd`
+ if [ ! -d "$KARAF_HOME" ]; then
+ die "KARAF_HOME is not valid: $KARAF_HOME"
fi
}
locateBase() {
- if [ "x$SERVICEMIX_BASE" != "x" ]; then
- if [ ! -d "$SERVICEMIX_BASE" ]; then
- die "SERVICEMIX_BASE is not valid: $SERVICEMIX_BASE"
+ if [ "x$KARAF_BASE" != "x" ]; then
+ if [ ! -d "$KARAF_BASE" ]; then
+ die "KARAF_BASE is not valid: $KARAF_BASE"
fi
else
- SERVICEMIX_BASE=$SERVICEMIX_HOME
+ KARAF_BASE=$KARAF_HOME
fi
}
setupNativePath() {
# Support for loading native libraries
- LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$SERVICEMIX_BASE/lib:$SERVICEMIX_HOME/lib"
+ LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib:$KARAF_HOME/lib"
# For Cygwin, set PATH from LD_LIBRARY_PATH
if $cygwin; then
@@ -186,7 +186,7 @@
export JAVA_OPTS
# Set Debug options if enabled
- if [ "x$SERVICEMIX_DEBUG" != "x" ]; then
+ if [ "x$KARAF_DEBUG" != "x" ]; then
# Use the defaults if JAVA_DEBUG_OPTS was not set
if [ "x$JAVA_DEBUG_OPTS" = "x" ]; then
JAVA_DEBUG_OPTS="$DEFAULT_JAVA_DEBUG_OPTS"
@@ -214,7 +214,7 @@
fi
# Add the jars in the lib dir
- for file in $SERVICEMIX_HOME/lib/*.jar
+ for file in $KARAF_HOME/lib/*.jar
do
if [ -z "$CLASSPATH" ]; then
CLASSPATH="$file"
@@ -238,10 +238,10 @@
# Unlimit the number of file descriptors if possible
unlimitFD
- # Locate the ServiceMix home directory
+ # Locate the Karaf home directory
locateHome
- # Locate the ServiceMix base directory
+ # Locate the Karaf base directory
locateBase
# Setup the native library path
@@ -262,26 +262,26 @@
}
run() {
- OPTS="-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=true"
+ OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true"
case "$1" in
'console')
shift
;;
'server')
- OPTS="-Dservicemix.startLocalConsole=false -Dservicemix.startRemoteShell=true"
+ OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true"
shift
;;
'client')
- OPTS="-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=false"
+ OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false"
shift
;;
esac
if $cygwin; then
- SERVICEMIX_HOME=`cygpath --path --windows "$SERVICEMIX_HOME"`
- SERVICEMIX_BASE=`cygpath --path --windows "$SERVICEMIX_BASE"`
+ KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
+ KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
fi
- exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -Dservicemix.base="$SERVICEMIX_BASE" -Djava.util.logging.config.file=$SERVICEMIX_BASE/etc/java.util.logging.properties $OPTS -classpath "$CLASSPATH" org.apache.felix.karaf.main.Main $*
+ exec $JAVA $JAVA_OPTS -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.Main $*
}
main() {
diff --git a/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat b/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
new file mode 100755
index 0000000..475663b
--- /dev/null
+++ b/karaf/assembly/src/main/distribution/windows-text/bin/karaf.bat
@@ -0,0 +1,166 @@
+@echo off
+rem
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+rem
+rem $Id: servicemix.bat 979 2005-11-30 22:50:55Z bsnyder $
+rem
+
+if not "%ECHO%" == "" echo %ECHO%
+
+setlocal
+set DIRNAME=%~dp0%
+set PROGNAME=%~nx0%
+set ARGS=%*
+
+title Karaf
+
+goto BEGIN
+
+:warn
+ echo %PROGNAME%: %*
+goto :EOF
+
+:BEGIN
+
+rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+if not "%KARAF_HOME%" == "" (
+ call :warn Ignoring predefined value for KARAF_HOME
+)
+set KARAF_HOME=%DIRNAME%..
+if not exist "%KARAF_HOME%" (
+ call :warn KARAF_HOME is not valid: %KARAF_HOME%
+ goto END
+)
+
+if not "%KARAF_BASE%" == "" (
+ if not exist "%KARAF_BASE%" (
+ call :warn KARAF_BASE is not valid: %KARAF_BASE%
+ goto END
+ )
+)
+if "%KARAF_BASE%" == "" (
+ set KARAF_BASE=%KARAF_HOME%
+)
+
+set LOCAL_CLASSPATH=%CLASSPATH%
+set DEFAULT_JAVA_OPTS=-server -Xmx512M -Dderby.system.home="%KARAF_BASE%\data\derby" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote
+set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf
+set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+
+if "%LOCAL_CLASSPATH%" == "" goto :KARAF_CLASSPATH_EMPTY
+ set CLASSPATH=%LOCAL_CLASSPATH%;%KARAF_BASE%\conf
+ goto :KARAF_CLASSPATH_END
+:KARAF_CLASSPATH_EMPTY
+ set CLASSPATH=%KARAF_BASE%\conf
+:KARAF_CLASSPATH_END
+
+rem Setup Karaf Home
+if exist "%KARAF_HOME%\conf\karaf-rc.cmd" call %KARAF_HOME%\conf\karaf-rc.cmd
+if exist "%HOME%\karaf-rc.cmd" call %HOME%\karaf-rc.cmd
+
+rem Support for loading native libraries
+set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib
+
+rem Setup the Java Virtual Machine
+if not "%JAVA%" == "" goto :Check_JAVA_END
+ set JAVA=java
+ if "%JAVA_HOME%" == "" call :warn JAVA_HOME not set; results may vary
+ if not "%JAVA_HOME%" == "" set JAVA=%JAVA_HOME%\bin\java
+ if not exist "%JAVA_HOME%" (
+ call :warn JAVA_HOME is not valid: "%JAVA_HOME%"
+ goto END
+ )
+:Check_JAVA_END
+
+if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
+
+if "%KARAF_DEBUG%" == "" goto :KARAF_DEBUG_END
+ rem Use the defaults if JAVA_DEBUG_OPTS was not set
+ if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
+
+ set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%"
+ call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
+:KARAF_DEBUG_END
+
+if "%KARAF_PROFILER%" == "" goto :KARAF_PROFILER_END
+ set KARAF_PROFILER_SCRIPT=%KARAF_HOME%\conf\profiler\%KARAF_PROFILER%.cmd
+
+ if exist "%KARAF_PROFILER_SCRIPT%" goto :KARAF_PROFILER_END
+ call :warn Missing configuration for profiler '%KARAF_PROFILER%': %KARAF_PROFILER_SCRIPT%
+ goto END
+:KARAF_PROFILER_END
+
+rem Setup the classpath
+pushd "%KARAF_HOME%\lib"
+for %%G in (*.*) do call:APPEND_TO_CLASSPATH %%G
+popd
+goto CLASSPATH_END
+
+: APPEND_TO_CLASSPATH
+set filename=%~1
+set suffix=%filename:~-4%
+if %suffix% equ .jar set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\lib\%filename%
+goto :EOF
+
+:CLASSPATH_END
+
+rem Execute the JVM or the load the profiler
+if "%KARAF_PROFILER%" == "" goto :RUN
+ rem Execute the profiler if it has been configured
+ call :warn Loading profiler script: %KARAF_PROFILER_SCRIPT%
+ call %KARAF_PROFILER_SCRIPT%
+
+:RUN
+ SET OPTS=-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true
+ SET SHIFT=false
+ if "%1" == "console" goto :EXECUTE_CONSOLE
+ if "%1" == "server" goto :EXECUTE_SERVER
+ if "%1" == "client" goto :EXECUTE_CLIENT
+ goto :EXECUTE
+
+:EXECUTE_CONSOLE
+ SET SHIFT=true
+ goto :EXECUTE
+
+:EXECUTE_SERVER
+ SET OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true"
+ SET SHIFT=true
+ goto :EXECUTE
+
+:EXECUTE_CLIENT
+ SET OPTS="-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=false"
+ SET SHIFT=true
+ goto :EXECUTE
+
+:EXECUTE
+ 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.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.util.logging.config.file=%KARAF_BASE%\etc\java.util.logging.properties org.apache.felix.karaf.main.Main %ARGS%
+
+rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+
+:END
+
+endlocal
+
+if not "%PAUSE%" == "" pause
+
+:END_NO_PAUSE
+
diff --git a/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat b/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat
deleted file mode 100755
index e41f784..0000000
--- a/karaf/assembly/src/main/distribution/windows-text/bin/servicemix.bat
+++ /dev/null
@@ -1,166 +0,0 @@
-@echo off
-rem
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-rem
-rem $Id: servicemix.bat 979 2005-11-30 22:50:55Z bsnyder $
-rem
-
-if not "%ECHO%" == "" echo %ECHO%
-
-setlocal
-set DIRNAME=%~dp0%
-set PROGNAME=%~nx0%
-set ARGS=%*
-
-title ServiceMix
-
-goto BEGIN
-
-:warn
- echo %PROGNAME%: %*
-goto :EOF
-
-:BEGIN
-
-rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-if not "%SERVICEMIX_HOME%" == "" (
- call :warn Ignoring predefined value for SERVICEMIX_HOME
-)
-set SERVICEMIX_HOME=%DIRNAME%..
-if not exist "%SERVICEMIX_HOME%" (
- call :warn SERVICEMIX_HOME is not valid: %SERVICEMIX_HOME%
- goto END
-)
-
-if not "%SERVICEMIX_BASE%" == "" (
- if not exist "%SERVICEMIX_BASE%" (
- call :warn SERVICEMIX_BASE is not valid: %SERVICEMIX_BASE%
- goto END
- )
-)
-if "%SERVICEMIX_BASE%" == "" (
- set SERVICEMIX_BASE=%SERVICEMIX_HOME%
-)
-
-set LOCAL_CLASSPATH=%CLASSPATH%
-set DEFAULT_JAVA_OPTS=-server -Xmx512M -Dderby.system.home="%SERVICEMIX_BASE%\data\derby" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote
-set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_BASE%\conf
-set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-
-if "%LOCAL_CLASSPATH%" == "" goto :SERVICEMIX_CLASSPATH_EMPTY
- set CLASSPATH=%LOCAL_CLASSPATH%;%SERVICEMIX_BASE%\conf
- goto :SERVICEMIX_CLASSPATH_END
-:SERVICEMIX_CLASSPATH_EMPTY
- set CLASSPATH=%SERVICEMIX_BASE%\conf
-:SERVICEMIX_CLASSPATH_END
-
-rem Setup Servicemix Home
-if exist "%SERVICEMIX_HOME%\conf\servicemix-rc.cmd" call %SERVICEMIX_HOME%\conf\servicemix-rc.cmd
-if exist "%HOME%\servicemix-rc.cmd" call %HOME%\servicemix-rc.cmd
-
-rem Support for loading native libraries
-set PATH=%PATH%;%SERVICEMIX_BASE%\lib;%SERVICEMIX_HOME%\lib
-
-rem Setup the Java Virtual Machine
-if not "%JAVA%" == "" goto :Check_JAVA_END
- set JAVA=java
- if "%JAVA_HOME%" == "" call :warn JAVA_HOME not set; results may vary
- if not "%JAVA_HOME%" == "" set JAVA=%JAVA_HOME%\bin\java
- if not exist "%JAVA_HOME%" (
- call :warn JAVA_HOME is not valid: "%JAVA_HOME%"
- goto END
- )
-:Check_JAVA_END
-
-if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
-
-if "%SERVICEMIX_DEBUG%" == "" goto :SERVICEMIX_DEBUG_END
- rem Use the defaults if JAVA_DEBUG_OPTS was not set
- if "%JAVA_DEBUG_OPTS%" == "" set JAVA_DEBUG_OPTS=%DEFAULT_JAVA_DEBUG_OPTS%
-
- set "JAVA_OPTS=%JAVA_DEBUG_OPTS% %JAVA_OPTS%"
- call :warn Enabling Java debug options: %JAVA_DEBUG_OPTS%
-:SERVICEMIX_DEBUG_END
-
-if "%SERVICEMIX_PROFILER%" == "" goto :SERVICEMIX_PROFILER_END
- set SERVICEMIX_PROFILER_SCRIPT=%SERVICEMIX_HOME%\conf\profiler\%SERVICEMIX_PROFILER%.cmd
-
- if exist "%SERVICEMIX_PROFILER_SCRIPT%" goto :SERVICEMIX_PROFILER_END
- call :warn Missing configuration for profiler '%SERVICEMIX_PROFILER%': %SERVICEMIX_PROFILER_SCRIPT%
- goto END
-:SERVICEMIX_PROFILER_END
-
-rem Setup the classpath
-pushd "%SERVICEMIX_HOME%\lib"
-for %%G in (*.*) do call:APPEND_TO_CLASSPATH %%G
-popd
-goto CLASSPATH_END
-
-: APPEND_TO_CLASSPATH
-set filename=%~1
-set suffix=%filename:~-4%
-if %suffix% equ .jar set CLASSPATH=%CLASSPATH%;%SERVICEMIX_HOME%\lib\%filename%
-goto :EOF
-
-:CLASSPATH_END
-
-rem Execute the JVM or the load the profiler
-if "%SERVICEMIX_PROFILER%" == "" goto :RUN
- rem Execute the profiler if it has been configured
- call :warn Loading profiler script: %SERVICEMIX_PROFILER_SCRIPT%
- call %SERVICEMIX_PROFILER_SCRIPT%
-
-:RUN
- SET OPTS=-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=true
- SET SHIFT=false
- if "%1" == "console" goto :EXECUTE_CONSOLE
- if "%1" == "server" goto :EXECUTE_SERVER
- if "%1" == "client" goto :EXECUTE_CLIENT
- goto :EXECUTE
-
-:EXECUTE_CONSOLE
- SET SHIFT=true
- goto :EXECUTE
-
-:EXECUTE_SERVER
- SET OPTS="-Dservicemix.startLocalConsole=false -Dservicemix.startRemoteShell=true"
- SET SHIFT=true
- goto :EXECUTE
-
-:EXECUTE_CLIENT
- SET OPTS="-Dservicemix.startLocalConsole=true -Dservicemix.startRemoteShell=false"
- SET SHIFT=true
- goto :EXECUTE
-
-:EXECUTE
- 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%" -Dservicemix.home="%SERVICEMIX_HOME%" -Dservicemix.base="%SERVICEMIX_BASE%" -Djava.util.logging.config.file=%SERVICEMIX_BASE%\etc\java.util.logging.properties org.apache.felix.karaf.main.Main %ARGS%
-
-rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-
-:END
-
-endlocal
-
-if not "%PAUSE%" == "" pause
-
-:END_NO_PAUSE
-
diff --git a/karaf/assembly/src/main/filtered-resources/etc/config.properties b/karaf/assembly/src/main/filtered-resources/etc/config.properties
index abdabca..b8b1457 100644
--- a/karaf/assembly/src/main/filtered-resources/etc/config.properties
+++ b/karaf/assembly/src/main/filtered-resources/etc/config.properties
@@ -52,10 +52,10 @@
#
# FileMonitor properties
#
-org.apache.servicemix.filemonitor.configDir = ${servicemix.base}/etc
-org.apache.servicemix.filemonitor.monitorDir = ${servicemix.base}/deploy
-org.apache.servicemix.filemonitor.generatedJarDir = ${servicemix.base}/data/generated-bundles
-org.apache.servicemix.filemonitor.scanInterval = 500
+org.apache.felix.karaf.filemonitor.configDir = ${karaf.base}/etc
+org.apache.felix.karaf.filemonitor.monitorDir = ${karaf.base}/deploy
+org.apache.felix.karaf.filemonitor.generatedJarDir = ${karaf.base}/data/generated-bundles
+org.apache.felix.karaf.filemonitor.scanInterval = 500
#