You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/11/17 19:15:12 UTC
svn commit: r1542778 - in /karaf/trunk: ./
assemblies/features/framework/src/main/filtered-resources/resources/bin/
assemblies/features/framework/src/main/filtered-resources/resources/etc/
assemblies/features/framework/src/main/resources/resources/depl...
Author: jbonofre
Date: Sun Nov 17 18:15:11 2013
New Revision: 1542778
URL: http://svn.apache.org/r1542778
Log:
[KARAF-2569] Introduce karaf.etc system property
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start.bat
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status.bat
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop.bat
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/distribution.info
karaf/trunk/assemblies/features/framework/src/main/resources/resources/deploy/README
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/equinox-debug.properties
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java
karaf/trunk/config/core/src/main/resources/OSGI-INF/metatype/metatype.xml
karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml
karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml
karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml
karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java
karaf/trunk/pom.xml
karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java
karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
karaf/trunk/system/core/src/main/java/org/apache/karaf/system/internal/SystemServiceImpl.java
karaf/trunk/system/core/src/test/java/org/apache/karaf/system/internal/SystemServiceImplTest.java
karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat
karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client Sun Nov 17 18:15:11 2013
@@ -139,6 +139,16 @@ locateData() {
fi
}
+locateEtc() {
+ if [ "x$KARAF_ETC" != "x" ]; then
+ if [ ! -d "$KARAF_ETC" ]; then
+ die "KARAF_ETC is not valid: $KARAF_ETC"
+ fi
+ else
+ KARAF_ETC=$KARAF_BASE/etc
+ fi
+}
+
setupNativePath() {
# Support for loading native libraries
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib:$KARAF_HOME/lib"
@@ -269,6 +279,9 @@ init() {
# Locate the Karaf data directory
locateData
+ # Locate the Karaf etc directory
+ locateEtc
+
# Setup the native library path
setupNativePath
@@ -288,10 +301,12 @@ run() {
if $cygwin; then
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
+ KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
+ KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -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.client.Main "$@"
+ 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.client.Main "$@"
}
main() {
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/client.bat Sun Nov 17 18:15:11 2013
@@ -84,6 +84,17 @@ if "%KARAF_DATA%" == "" (
set "KARAF_DATA=%KARAF_BASE%\data"
)
+if not "%KARAF_ETC%" == "" (
+ if not exist "%KARAF_ETC%" (
+ call :warn KARAF_ETC is not valid: "%KARAF_ETC%"
+ goto END
+ )
+)
+if "%KARAF_ETC%" == "" (
+ set "KARAF_ETC=%KARAF_BASE%\etc"
+)
+
+
rem Support for loading native libraries
set PATH=%PATH%;%KARAF_BASE%\lib;%KARAF_HOME%\lib
@@ -110,7 +121,7 @@ set CLASSPATH=%CLASSPATH%;%KARAF_HOME%\s
if "%SHIFT%" == "true" SET ARGS=%2 %3 %4 %5 %6 %7 %8 %9
if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8 %9
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.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% 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%" -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.client.Main %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance Sun Nov 17 18:15:11 2013
@@ -139,6 +139,16 @@ locateData() {
fi
}
+locateEtc() {
+ if [ "x$KARAF_ETC" != "x" ]; then
+ if [ ! -d "$KARAF_ETC" ]; then
+ die "KARAF_ETC is not valid: $KARAF_ETC"
+ fi
+ else
+ KARAF_ETC=$KARAF_BASE/etc
+ fi
+}
+
setupNativePath() {
# Support for loading native libraries
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib:$KARAF_HOME/lib"
@@ -296,6 +306,9 @@ init() {
# Locate the Karaf data directory
locateData
+ # Locate the Karaf etc directory
+ locateEtc
+
# Setup the native library path
setupNativePath
@@ -320,14 +333,16 @@ run() {
if $cygwin; then
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
+ KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
+ KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
if [ "x$KARAF_ACL" != "x" ]; then
warn "Enabling Security ACL support"
- exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.instance.main.Execute "$@"
+ 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" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.instance.main.Execute "$@"
else
- exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -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.instance.main.Execute "$@"
+ 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.instance.main.Execute "$@"
fi
}
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance.bat Sun Nov 17 18:15:11 2013
@@ -84,6 +84,16 @@ if "%KARAF_DATA%" == "" (
set "KARAF_DATA=%KARAF_BASE%\data"
)
+if not "%KARAF_ETC%" == "" (
+ if not exist "%KARAF_ETC%" (
+ call :warn KARAF_ETC is not valid: "%KARAF_ETC%"
+ goto END
+ )
+)
+if "%KARAF_ETC%" == "" (
+ set "KARAF_ETC=%KARAF_BASE%\etc"
+)
+
set DEFAULT_JAVA_OPTS=
set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
@@ -118,10 +128,10 @@ set CLASSPATH=%KARAF_HOME%\system\org\ap
if not "%SHIFT%" == "true" SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
if "%KARAF_ACL%" == "" (
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% org.apache.karaf.instance.main.Execute %ARGS%
+ "%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.instance.main.Execute %ARGS%
) else (
echo Enabling Security ACL support
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%" -Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%" -Dkaraf.base="%KARAF_BASE%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder %KARAF_OPTS% org.apache.karaf.instance.main.Execute %ARGS%
+ "%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" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder %KARAF_OPTS% org.apache.karaf.instance.main.Execute %ARGS%
)
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf Sun Nov 17 18:15:11 2013
@@ -146,6 +146,16 @@ locateData() {
fi
}
+locateEtc() {
+ if [ "x$KARAF_ETC" != "x" ]; then
+ if [ ! -d "$KARAF_ETC" ]; then
+ die "KARAF_ETC is not valid: $KARAF_ETC"
+ fi
+ else
+ KARAF_ETC=$KARAF_BASE/etc
+ fi
+}
+
setupNativePath() {
# Support for loading native libraries
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib:$KARAF_HOME/lib"
@@ -320,6 +330,9 @@ init() {
# Locate the Karaf data directory
locateData
+ # Locate the Karaf etc directory
+ locateEtc
+
# Setup the native library path
setupNativePath
@@ -387,6 +400,7 @@ run() {
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
+ KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
@@ -396,9 +410,9 @@ run() {
if [ "x$KARAF_ACL" != "x" ]; then
warn "Enabling Security ACL support"
- exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN "$@"
+ exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN "$@"
else
- exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -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" $MAIN "$@"
+ exec "$JAVA" $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -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" $MAIN "$@"
fi
}
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf.bat Sun Nov 17 18:15:11 2013
@@ -82,7 +82,17 @@ if not "%KARAF_DATA%" == "" (
)
if "%KARAF_DATA%" == "" (
set "KARAF_DATA=%KARAF_BASE%\data"
-)
+)
+
+if not "%KARAF_ETC%" == "" (
+ if not exist "%KARAF_ETC%" (
+ call :warn KARAF_ETC is not valid: "%KARAF_ETC%"
+ goto END
+ )
+)
+if "%KARAF_ETC%" == "" (
+ set "KARAF_ETC=%KARAF_BASE%\etc"
+)
set LOCAL_CLASSPATH=%CLASSPATH%
set JAVA_MODE=-server
@@ -313,10 +323,10 @@ if "%KARAF_PROFILER%" == "" goto :RUN
rem Execute the Java Virtual Machine
cd "%KARAF_BASE%"
if "%KARAF_ACL%" == "" (
- "%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%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Dkaraf.data="%KARAF_DATA%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% %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.etc="%KARAF_ETC%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Dkaraf.data="%KARAF_DATA%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" %KARAF_OPTS% %MAIN% %ARGS%
) else (
echo Enabling Security ACL support
- "%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%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Dkaraf.data="%KARAF_DATA%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder %KARAF_OPTS% %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.etc="%KARAF_ETC%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Dkaraf.data="%KARAF_DATA%" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder %KARAF_OPTS% %MAIN% %ARGS%
)
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv Sun Nov 17 18:15:11 2013
@@ -42,5 +42,6 @@
# export KARAF_HOME # Karaf home folder
# export KARAF_DATA # Karaf data folder
# export KARAF_BASE # Karaf base folder
+# export KARAF_ETC # Karaf etc folder
# export KARAF_OPTS # Additional available Karaf options
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/setenv.bat Sun Nov 17 18:15:11 2013
@@ -52,6 +52,8 @@ rem Karaf data folder
rem SET KARAF_DATA
rem Karaf base folder
rem SET KARAF_BASE
+rem Karaf etc folder
+rem SET KARAF_ETC
rem Additional available Karaf options
rem SET KARAF_OPTS
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell Sun Nov 17 18:15:11 2013
@@ -139,6 +139,16 @@ locateData() {
fi
}
+locateEtc() {
+ if [ "x$KARAF_ETC" != "x" ]; then
+ if [ ! -d "$KARAF_ETC" ]; then
+ die "KARAF_ETC is not valid: $KARAF_ETC"
+ fi
+ else
+ KARAF_ETC=$KARAF_BASE/etc
+ fi
+}
+
setupNativePath() {
# Support for loading native libraries
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$KARAF_BASE/lib:$KARAF_HOME/lib"
@@ -292,6 +302,9 @@ init() {
# Locate the Karaf data directory
locateData
+ # Locate the Karaf etc directory
+ locateEtc
+
# Setup the native library path
setupNativePath
@@ -314,10 +327,12 @@ run() {
if $cygwin; then
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
+ KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
+ KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
- exec "$JAVA" $JAVA_OPTS -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder $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" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder $KARAF_OPTS $OPTS -classpath "$CLASSPATH" org.apache.karaf.shell.console.impl.Main --classpath="$KARAF_HOME/system" "$@"
}
main() {
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell.bat Sun Nov 17 18:15:11 2013
@@ -84,6 +84,16 @@ if "%KARAF_DATA%" == "" (
set "KARAF_DATA=%KARAF_BASE%\data"
)
+if not "%KARAF_ETC%" == "" (
+ if not exist "%KARAF_ETC%" (
+ call :warn KARAF_ETC is not valid: "%KARAF_ETC%"
+ goto END
+ )
+)
+if "%KARAF_ETC%" == "" (
+ set "KARAF_ETC=%KARAF_BASE%\etc"
+)
+
set DEFAULT_JAVA_OPTS=
set DEFAULT_JAVA_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005
@@ -119,7 +129,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.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder %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%" -Djava.io.tmpdir="%KARAF_DATA%\tmp" -Djava.util.logging.config.file="%KARAF_BASE%\etc\java.util.logging.properties" -Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder %KARAF_OPTS% org.apache.karaf.shell.console.impl.Main --classpath="%KARAF_HOME%\system" %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start Sun Nov 17 18:15:11 2013
@@ -99,6 +99,16 @@ locateData() {
fi
}
+locateEtc() {
+ if [ "x$KARAF_ETC" != "x" ]; then
+ if [ ! -d "$KARAF_ETC" ]; then
+ die "KARAF_ETC is not valid: $KARAF_ETC"
+ fi
+ else
+ KARAF_ETC=$KARAF_BASE/etc
+ fi
+}
+
init() {
# Determine if there is special OS handling we must perform
detectOS
@@ -111,6 +121,9 @@ init() {
# Locate the Karaf data directory
locateData
+
+ # Locate the Karaf etc directory
+ locateEtc
}
run() {
@@ -118,6 +131,7 @@ run() {
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
+ KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
# Ensure the log directory exists -- we need to have a place to redirect stdout/stderr
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/start.bat Sun Nov 17 18:15:11 2013
@@ -66,6 +66,26 @@ if "%KARAF_BASE%" == "" (
set "KARAF_BASE=%KARAF_HOME%"
)
+if not "%KARAF_DATA%" == "" (
+ if not exist "%KARAF_DATA%" (
+ call :warn KARAF_DATA is not valid: "%KARAF_DATA%"
+ goto END
+ )
+)
+if "%KARAF_DATA%" == "" (
+ set "KARAF_DATA=%KARAF_BASE%\data"
+)
+
+if not "%KARAF_ETC%" == "" (
+ if not exist "%KARAF_ETC%" (
+ call :warn KARAF_ETC is not valid: "%KARAF_ETC%"
+ goto END
+ )
+)
+if "%KARAF_ETC%" == "" (
+ set "KARAF_ETC=%KARAF_BASE%\etc"
+)
+
:EXECUTE
start "Karaf" /MIN "%KARAF_HOME%\bin\karaf.bat" server %*
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status Sun Nov 17 18:15:11 2013
@@ -99,6 +99,16 @@ locateData() {
fi
}
+locateEtc() {
+ if [ "x$KARAF_ETC" != "x" ]; then
+ if [ ! -d "$KARAF_ETC" ]; then
+ die "KARAF_ETC is not valid: $KARAF_ETC"
+ fi
+ else
+ KARAF_ETC=$KARAF_BASE/etc
+ fi
+}
+
init() {
# Determine if there is special OS handling we must perform
detectOS
@@ -111,6 +121,9 @@ init() {
# Locate the Karaf data directory
locateData
+
+ # Locate the Karaf etc directory
+ locateEtc
}
run() {
@@ -118,6 +131,7 @@ run() {
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
+ KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
# Ensure the log directory exists -- we need to have a place to redirect stdout/stderr
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/status.bat Sun Nov 17 18:15:11 2013
@@ -66,6 +66,26 @@ if "%KARAF_BASE%" == "" (
set "KARAF_BASE=%KARAF_HOME%"
)
+if not "%KARAF_DATA%" == "" (
+ if not exist "%KARAF_DATA%" (
+ call :warn KARAF_DATA is not valid: "%KARAF_DATA%"
+ goto END
+ )
+)
+if "%KARAF_DATA%" == "" (
+ set "KARAF_DATA=%KARAF_BASE%\data"
+)
+
+if not "%KARAF_ETC%" == "" (
+ if not exist "%KARAF_ETC%" (
+ call :warn KARAF_ETC is not valid: "%KARAF_ETC%"
+ goto END
+ )
+)
+if "%KARAF_ETC%" == "" (
+ set "KARAF_ETC=%KARAF_BASE%\etc"
+)
+
:EXECUTE
"%KARAF_HOME%\bin\karaf.bat" status
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop Sun Nov 17 18:15:11 2013
@@ -99,6 +99,16 @@ locateData() {
fi
}
+locateEtc() {
+ if [ "x$KARAF_ETC" != "x" ]; then
+ if [ ! -d "$KARAF_ETC" ]; then
+ die "KARAF_ETC is not valid: $KARAF_ETC"
+ fi
+ else
+ KARAF_ETC=$KARAF_BASE/etc
+ fi
+}
+
init() {
# Determine if there is special OS handling we must perform
detectOS
@@ -111,6 +121,9 @@ init() {
# Locate the Karaf data directory
locateData
+
+ # Locat the Karaf etc directory
+ locateEtc
}
run() {
@@ -118,6 +131,7 @@ run() {
KARAF_HOME=`cygpath --path --windows "$KARAF_HOME"`
KARAF_BASE=`cygpath --path --windows "$KARAF_BASE"`
KARAF_DATA=`cygpath --path --windows "$KARAF_DATA"`
+ KARAF_ETC=`cygpath --path --windows "$KARAF_ETC"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
# Ensure the log directory exists -- we need to have a place to redirect stdout/stderr
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop.bat (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/bin/stop.bat Sun Nov 17 18:15:11 2013
@@ -66,6 +66,26 @@ if "%KARAF_BASE%" == "" (
set "KARAF_BASE=%KARAF_HOME%"
)
+if not "%KARAF_DATA%" == "" (
+ if not exist "%KARAF_DATA%" (
+ call :warn KARAF_DATA is not valid: "%KARAF_DATA%"
+ goto END
+ )
+)
+if "%KARAF_DATA%" == "" (
+ set "KARAF_DATA=%KARAF_BASE%\data"
+)
+
+if not "%KARAF_ETC%" == "" (
+ if not exist "%KARAF_ETC%" (
+ call :warn KARAF_ETC is not valid: "%KARAF_ETC%"
+ goto END
+ )
+)
+if "%KARAF_ETC%" == "" (
+ set "KARAF_ETC=%KARAF_BASE%\etc"
+)
+
:EXECUTE
"%KARAF_HOME%\bin\karaf.bat" stop
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties Sun Nov 17 18:15:11 2013
@@ -159,7 +159,7 @@ karaf.shutdown.port.file=${karaf.data}/p
# Configuration FileMonitor properties
#
felix.fileinstall.enableConfigSave = false
-felix.fileinstall.dir = ${karaf.base}/etc
+felix.fileinstall.dir = ${karaf.etc}
felix.fileinstall.filter = .*\\.cfg
felix.fileinstall.poll = 1000
felix.fileinstall.noInitialDelay = true
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/distribution.info
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/distribution.info?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/distribution.info (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/distribution.info Sun Nov 17 18:15:11 2013
@@ -21,7 +21,6 @@
# This file contains the general platform information required by the itests to find out
# about the current versions.
#
-
karafVersion=${project.version}
name=Apache Karaf
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/deploy/README
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/deploy/README?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/deploy/README (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/deploy/README Sun Nov 17 18:15:11 2013
@@ -15,4 +15,4 @@
* limitations under the License.
*/
-This folder can be used to deploy artifacts into the OSGi framework.
+This folder can be used to deploy artifacts into the Karaf container.
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/equinox-debug.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/equinox-debug.properties?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/equinox-debug.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/equinox-debug.properties Sun Nov 17 18:15:11 2013
@@ -17,33 +17,33 @@
#### Debugging options for org.eclipse.bundles
# Turn on general debugging for org.eclipse.bundles
-org.eclipse.osgi/debug=false
+org.eclipse.osgi/debug = false
# Prints out class loading debug information
-org.eclipse.osgi/debug/loader=false
+org.eclipse.osgi/debug/loader = false
# Prints out event (FrameworkEvent/BundleEvent/ServiceEvent) and listener debug information
-org.eclipse.osgi/debug/events=false
+org.eclipse.osgi/debug/events = false
# Prints out OSGi service debug information (registration/getting/ungetting etc.)
-org.eclipse.osgi/debug/services=false
+org.eclipse.osgi/debug/services = false
# Prints out bundle manifest parsing debug information
-org.eclipse.osgi/debug/manifest=false
+org.eclipse.osgi/debug/manifest = false
# Prints out LDAP filter debug information
-org.eclipse.osgi/debug/filter=false
+org.eclipse.osgi/debug/filter = false
# Prints out security (PermissionAdmin service) debug information
-org.eclipse.osgi/debug/security=false
+org.eclipse.osgi/debug/security = false
# Prints out start level service debug information
-org.eclipse.osgi/debug/startlevel=false
+org.eclipse.osgi/debug/startlevel = false
# Prints out package instance service debug information
-org.eclipse.osgi/debug/packageadmin=false
+org.eclipse.osgi/debug/packageadmin = false
# Prints out timing information for bundle activation
-org.eclipse.osgi/debug/bundleTime=false
+org.eclipse.osgi/debug/bundleTime = false
# Debug the loading of message bundles
-org.eclipse.osgi/debug/messageBundles=false
+org.eclipse.osgi/debug/messageBundles = false
# Eclipse adaptor options
org.eclipse.osgi/eclipseadaptor/debug = false
org.eclipse.osgi/eclipseadaptor/debug/location = false
-org.eclipse.osgi/eclipseadaptor/debug/platformadmin=false
-org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver=false
+org.eclipse.osgi/eclipseadaptor/debug/platformadmin = false
+org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver = false
org.eclipse.osgi/eclipseadaptor/converter/debug = false
### OSGi resolver options
@@ -83,21 +83,21 @@ org.eclipse.osgi/defaultprofile/buffersi
#### Monitoring settings
# monitor class loading
-org.eclipse.osgi/monitor/classes=false
+org.eclipse.osgi/monitor/classes = false
# monitor bundle activation
-org.eclipse.osgi/monitor/activation=false
+org.eclipse.osgi/monitor/activation = false
# monitor resource bundle (*.properties) loading
-org.eclipse.osgi/monitor/resources=false
+org.eclipse.osgi/monitor/resources = false
#### Trace settings
# trace class loading - snapshot the execution stack when a class is loaded
-org.eclipse.osgi/trace/classLoading=false
+org.eclipse.osgi/trace/classLoading = false
# trace location - file in which execution traces are written
-org.eclipse.osgi/trace/filename=runtime.traces
+org.eclipse.osgi/trace/filename = runtime.traces
# trace filters - Java properties file defining which classes should
# be traced (if trace/classLoading is true)
@@ -105,7 +105,7 @@ org.eclipse.osgi/trace/filename=runtime.
# plugins=<comma separated list of plugins whose classes to trace>
# packages=<comma separated list of package prefixes of classes to trace>
# Note that there may be many 'plugins' and 'packages' lines in one file.
-org.eclipse.osgi/trace/filters=trace.properties
+org.eclipse.osgi/trace/filters = trace.properties
# trace bundle activation - snapshot the execution stack when a bundle is activated
-org.eclipse.osgi/trace/activation=false
+org.eclipse.osgi/trace/activation = false
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg Sun Nov 17 18:15:11 2013
@@ -22,13 +22,13 @@
# It could be directly installed using feature:repo-add command
#
-cellar=org.apache.karaf.cellar:apache-karaf-cellar:xml:features:(0,]
-camel=org.apache.camel.karaf:apache-camel:xml:features:(0,]
-camel-extras=org.apache-extras.karaf:camel-extra:xml:features:(0,]
-cxf=org.apache.cxf.karaf:apache-cxf:xml:features:(0,]
-cxf-dosgi=org.apache.cxf.dosgi:cxf-dosgi:xml:features:(0,]
-activemq=org.apache.activemq:activemq-karaf:xml:features:(0,]
-jclouds=org.jclouds.karaf:jclouds-karaf:xml:features:(0,]
-openejb=org.apache.openejb:openejb-feature:xml:features:(0,]
-wicket=org.ops4j.pax.wicket:features:xml:features:(0,]
-hawtio=io.hawt:hawtio-karaf:xml:features:(0,]
+cellar = org.apache.karaf.cellar:apache-karaf-cellar:xml:features:(0,]
+camel = org.apache.camel.karaf:apache-camel:xml:features:(0,]
+camel-extras = org.apache-extras.karaf:camel-extra:xml:features:(0,]
+cxf = org.apache.cxf.karaf:apache-cxf:xml:features:(0,]
+cxf-dosgi = org.apache.cxf.dosgi:cxf-dosgi:xml:features:(0,]
+activemq = org.apache.activemq:activemq-karaf:xml:features:(0,]
+jclouds = org.jclouds.karaf:jclouds-karaf:xml:features:(0,]
+openejb = org.apache.openejb:openejb-feature:xml:features:(0,]
+wicket = org.ops4j.pax.wicket:features:xml:features:(0,]
+hawtio = io.hawt:hawtio-karaf:xml:features:(0,]
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.apache.karaf.shell.cfg Sun Nov 17 18:15:11 2013
@@ -24,42 +24,42 @@
#
# Via sshPort and sshHost you define the address you can login into Karaf.
#
-sshPort=8101
-sshHost=0.0.0.0
+sshPort = 8101
+sshHost = 0.0.0.0
#
# The sshIdleTimeout defines the inactivity timeout to logout the SSH session.
# The sshIdleTimeout is in milliseconds, and the default is set to 30 minutes.
#
-sshIdleTimeout=1800000
+sshIdleTimeout = 1800000
#
# sshRealm defines which JAAS domain to use for password authentication.
#
-sshRealm=karaf
+sshRealm = karaf
#
# The location of the hostKey file defines where the private/public key of the server
# is located. If no file is at the defined location it will be ignored.
#
-hostKey=${karaf.base}/etc/host.key
+hostKey = ${karaf.etc}/host.key
#
# Role name used for SSH access authorization
# If not set, this defaults to the ${karaf.admin.role} configured in etc/system.properties
#
-# sshRole=admin
+# sshRole = admin
#
# Self defined key size in 1024, 2048, 3072, or 4096
# If not set, this defaults to 1024.
#
-# keySize=1024
+# keySize = 1024
#
# Specify host key algorithm, defaults to DSA
#
-# algorithm=DSA
+# algorithm = DSA
#
# Defines the completion mode on the Karaf shell console. The possible values are:
@@ -72,4 +72,4 @@ hostKey=${karaf.base}/etc/host.key
# This property define the default value when you use the Karaf shell console.
# You can change the completion mode directly in the shell console, using shell:completion command.
#
-completionMode=GLOBAL
\ No newline at end of file
+completionMode = GLOBAL
\ No newline at end of file
Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties (original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/system.properties Sun Nov 17 18:15:11 2013
@@ -28,42 +28,42 @@
# is not fully available.
# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
# instead.
-org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+org.ops4j.pax.logging.DefaultServiceLog.level = ERROR
#
# Name of this Karaf instance.
#
-karaf.name=root
+karaf.name = root
#
# Default repository where bundles will be loaded from before using
# other Maven repositories. For the full Maven configuration, see
# the org.ops4j.pax.url.mvn.cfg file.
#
-karaf.default.repository=system
+karaf.default.repository = system
#
# Location of a shell script that will be run when starting a shell
# session. This script can be used to create aliases and define
# additional commands.
#
-karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+karaf.shell.init.script = ${karaf.etc}/shell.init.script
#
# Sets the maximum size of the shell command history. If not set,
# defaults to 500 entries. Setting to 0 will disable history.
#
-# karaf.shell.history.maxSize=0
+# karaf.shell.history.maxSize = 0
#
# Deletes the entire karaf.data directory at every start
#
-karaf.clean.all=false
+karaf.clean.all = false
#
# Deletes the karaf.data/cache directory at every start
#
-karaf.clean.cache=false
+karaf.clean.cache = false
#
# Roles to use when logging into a local Karaf console.
@@ -75,36 +75,36 @@ karaf.clean.cache=false
# and principal is the name of the principal of that class
# (defaults to instance).
#
-karaf.local.roles=admin,manager,viewer
+karaf.local.roles = admin,manager,viewer
#
# Set this empty property to avoid errors when validating xml documents.
#
-xml.catalog.files=
+xml.catalog.files =
#
# Suppress the bell in the console when hitting backspace too many times
# for example
#
-jline.nobell=true
+jline.nobell = true
#
# ServiceMix specs options
#
-org.apache.servicemix.specs.debug=false
-org.apache.servicemix.specs.timeout=100
+org.apache.servicemix.specs.debug = false
+org.apache.servicemix.specs.timeout = 100
#
# Settings for the OSGi 4.3 Weaving
# By default, we will not weave any classes. Change this setting to include classes
# that you application needs to have woven.
#
-org.apache.aries.proxy.weaving.enabled=none
+org.apache.aries.proxy.weaving.enabled = none
# Classes not to weave - Aries default + Xerces which is known to have issues.
-org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
+org.apache.aries.proxy.weaving.disabled = org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
#
# By default, only Karaf shell commands are secured, but additional services can be
# secured by expanding this filter
#
-karaf.secured.services=(&(osgi.command.scope=*)(osgi.command.function=*))
+karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Sun Nov 17 18:15:11 2013
@@ -145,7 +145,7 @@
sshPort=8101
sshHost=0.0.0.0
sshRealm=karaf
- hostKey=${karaf.base}/etc/host.key
+ hostKey=${karaf.etc}/host.key
</config>
<bundle start="true" start-level="30">mvn:org.apache.mina/mina-core/${mina.version}</bundle>
<bundle start="true" start-level="30">mvn:org.apache.sshd/sshd-core/${sshd.version}</bundle>
Modified: karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java
URL: http://svn.apache.org/viewvc/karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java (original)
+++ karaf/trunk/client/src/main/java/org/apache/karaf/client/ClientConfig.java Sun Nov 17 18:15:11 2013
@@ -39,7 +39,7 @@ public class ClientConfig {
private String command;
public ClientConfig(String[] args) throws IOException {
- Properties shellCfg = new Properties(new File(System.getProperty("karaf.home"), "etc/org.apache.karaf.shell.cfg"));
+ Properties shellCfg = new Properties(new File(System.getProperty("karaf.etc"), "org.apache.karaf.shell.cfg"));
host = shellCfg.getProperty("sshHost", "localhost");
port = Integer.parseInt(shellCfg.getProperty("sshPort", "8101"));
@@ -84,7 +84,7 @@ public class ClientConfig {
}
command = commandBuilder.toString();
- Properties usersCfg = new Properties(new File(System.getProperty("karaf.home") + "/etc/users.properties"));
+ Properties usersCfg = new Properties(new File(System.getProperty("karaf.etc") + "/users.properties"));
if (!usersCfg.isEmpty()) {
if (user == null) {
user = (String) usersCfg.keySet().iterator().next();
Modified: karaf/trunk/config/core/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/core/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/config/core/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ karaf/trunk/config/core/src/main/resources/OSGI-INF/metatype/metatype.xml Sun Nov 17 18:15:11 2013
@@ -19,7 +19,7 @@
-->
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
<OCD id="org.apache.karaf.config" name="%config.name" description="%config.description">
- <AD id="storage" type="String" default="${karaf.base}/etc/"
+ <AD id="storage" type="String" default="${karaf.etc}/"
name="%storage.name" description="%storage.description"/>
</OCD>
<Designate pid="org.apache.karaf.config">
Modified: karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/trunk/features/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Sun Nov 17 18:15:11 2013
@@ -38,7 +38,7 @@ http://aries.apache.org/blueprint/xmlns/
<ext:property name="respectStartLvlDuringFeatureUninstall" value="true"/>
<ext:property name="featuresBootAsynchronous" value="false"/>
</ext:default-properties>
- <ext:location>file:$(karaf.base)/etc/org.apache.karaf.features.cfg</ext:location>
+ <ext:location>file:$(karaf.etc)/org.apache.karaf.features.cfg</ext:location>
</ext:property-placeholder>
<bean id="bundleManager" class="org.apache.karaf.features.internal.BundleManager">
Modified: karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml (original)
+++ karaf/trunk/features/core/src/test/resources/org/apache/karaf/features/internal/f02.xml Sun Nov 17 18:15:11 2013
@@ -97,7 +97,7 @@
<config name="org.ops4j.pax.web">
org.osgi.service.http.port=8181
javax.servlet.context.tempdir=${karaf.data}/pax-web-jsp
- org.ops4j.pax.web.config.file=${karaf.base}/etc/jetty.xml
+ org.ops4j.pax.web.config.file=${karaf.etc}/jetty.xml
</config>
<feature version="[7.0,8.0)">jetty</feature>
<bundle>mvn:org.ops4j.pax.web/pax-web-api/1.0.1</bundle>
@@ -141,7 +141,7 @@
sshPort=8101
sshHost=0.0.0.0
sshRealm=karaf
- hostKey=${karaf.base}/etc/host.key
+ hostKey=${karaf.etc}/host.key
</config>
<bundle dependency='true'>mvn:org.apache.mina/mina-core/2.0.1</bundle>
<bundle dependency='true'>mvn:org.apache.sshd/sshd-core/0.5.0</bundle>
Modified: karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml (original)
+++ karaf/trunk/features/obr/src/main/resources/OSGI-INF/blueprint/features-obr.xml Sun Nov 17 18:15:11 2013
@@ -29,7 +29,7 @@
<ext:property name="startByDefault" value="true"/>
<ext:property name="startLevel" value="80"/>
</ext:default-properties>
- <ext:location>file:$(karaf.base)/etc/org.apache.karaf.features.obr.cfg</ext:location>
+ <ext:location>file:$(karaf.etc)/org.apache.karaf.features.obr.cfg</ext:location>
</ext:property-placeholder>
<bean id="obrResolver" class="org.apache.karaf.features.obr.internal.ObrResolver">
Modified: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java Sun Nov 17 18:15:11 2013
@@ -416,6 +416,7 @@ public class InstanceServiceImpl impleme
+ " -Dkaraf.home=\"" + System.getProperty("karaf.home") + "\""
+ " -Dkaraf.base=\"" + new File(location).getCanonicalPath() + "\""
+ " -Dkaraf.data=\"" + new File(new File(location).getCanonicalPath(), "data") + "\""
+ + " -Dkaraf.etc=\"" + new File(new File(location).getCanonicalPath(), "etc") + "\""
+ " -Dkaraf.startLocalConsole=false"
+ " -Dkaraf.startRemoteShell=true"
+ " -classpath \"" + classpath.toString() + "\""
@@ -614,6 +615,7 @@ public class InstanceServiceImpl impleme
props.put("karaf.base", new File(instance.loc).getCanonicalPath());
props.put("karaf.home", System.getProperty("karaf.home"));
props.put("karaf.data", new File(new File(instance.loc), "data").getCanonicalPath());
+ props.put("karaf.etc", new File(new File(instance.loc), "etc").getCanonicalPath());
for (Enumeration e = props.propertyNames(); e.hasMoreElements();) {
String key = (String) e.nextElement();
props.setProperty(key,
Modified: karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties (original)
+++ karaf/trunk/instance/core/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties Sun Nov 17 18:15:11 2013
@@ -47,7 +47,7 @@ karaf.default.repository=system
# session. This script can be used to create aliases and define
# additional commands.
#
-karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+karaf.shell.init.script=${karaf.etc}/shell.init.script
#
# Sets the maximum size of the shell command history. If not set,
Modified: karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml (original)
+++ karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml Sun Nov 17 18:15:11 2013
@@ -44,7 +44,7 @@
<jaas:config name="karaf">
<jaas:module className="org.apache.karaf.jaas.modules.properties.PropertiesLoginModule" flags="sufficient">
- users = $[karaf.base]/etc/users.properties
+ users = $[karaf.etc]/users.properties
detailed.login.exception = ${detailed.login.exception}
encryption.name = ${encryption.name}
encryption.enabled = ${encryption.enabled}
@@ -54,7 +54,7 @@
encryption.encoding = ${encryption.encoding}
</jaas:module>
<jaas:module className="org.apache.karaf.jaas.modules.publickey.PublickeyLoginModule" flags="sufficient">
- users = $[karaf.base]/etc/keys.properties
+ users = $[karaf.etc]/keys.properties
detailed.login.exception = ${detailed.login.exception}
encryption.name = ${encryption.name}
encryption.enabled = ${encryption.enabled}
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/ConfigProperties.java Sun Nov 17 18:15:11 2013
@@ -60,6 +60,16 @@ public class ConfigProperties {
*/
public static final String ENV_KARAF_DATA = "KARAF_DATA";
/**
+ * The system property for specifying the Karaf etc directory. The etc directory
+ * holds the configuration for a Karaf instance.
+ */
+ public static final String PROP_KARAF_ETC = "karaf.etc";
+ /**
+ * The environment variable for specifying the Karaf etc directory. The etc directory
+ * holds the configuration for a Karaf instance.
+ */
+ public static final String ENV_KARAF_ETC = "KARAF_ETC";
+ /**
* The system property for specifying the Karaf data directory. The data directory
* holds the bundles data and cache for a Karaf instance.
*/
@@ -134,6 +144,7 @@ public class ConfigProperties {
File karafHome;
File karafBase;
File karafData;
+ File karafEtc;
File karafInstances;
Properties props;
@@ -154,9 +165,6 @@ public class ConfigProperties {
String shutdownHost;
String portFile;
String shutdownCommand;
- String includes;
- String optionals;
- File etcFolder;
String startupMessage;
boolean delayConsoleStart;
@@ -164,6 +172,7 @@ public class ConfigProperties {
this.karafHome = Utils.getKarafHome(ConfigProperties.class, PROP_KARAF_HOME, ENV_KARAF_HOME);
this.karafBase = Utils.getKarafDirectory(PROP_KARAF_BASE, ENV_KARAF_BASE, karafHome, false, true);
this.karafData = Utils.getKarafDirectory(PROP_KARAF_DATA, ENV_KARAF_DATA, new File(karafBase, "data"), true, true);
+ this.karafEtc = Utils.getKarafDirectory(PROP_KARAF_ETC, ENV_KARAF_ETC, new File(karafBase, "etc"), true, true);
this.karafInstances = Utils.getKarafDirectory(PROP_KARAF_INSTANCES, ENV_KARAF_INSTANCES, new File(karafHome, "instances"), false, false);
@@ -175,11 +184,10 @@ public class ConfigProperties {
System.setProperty(PROP_KARAF_DATA, karafData.getPath());
System.setProperty(PROP_KARAF_INSTANCES, karafInstances.getPath());
- this.etcFolder = new File(karafBase, "etc");
- if (!etcFolder.exists()) {
- throw new FileNotFoundException("etc folder not found: " + etcFolder.getAbsolutePath());
+ if (!karafEtc.exists()) {
+ throw new FileNotFoundException("Karaf etc folder not found: " + karafEtc.getAbsolutePath());
}
- PropertiesLoader.loadSystemProperties(new File(etcFolder, SYSTEM_PROPERTIES_FILE_NAME));
+ PropertiesLoader.loadSystemProperties(new File(karafEtc, SYSTEM_PROPERTIES_FILE_NAME));
File cleanAllIndicatorFile = new File(karafData, "clean_all");
File cleanCacheIndicatorFile = new File(karafData, "clean_cache");
@@ -199,7 +207,7 @@ public class ConfigProperties {
}
}
- File file = new File(etcFolder, CONFIG_PROPERTIES_FILE_NAME);
+ File file = new File(karafEtc, CONFIG_PROPERTIES_FILE_NAME);
this.props = PropertiesLoader.loadConfigProperties(file);
String prop = props.getProperty(SECURITY_PROVIDERS);
@@ -228,7 +236,7 @@ public class ConfigProperties {
System.setProperty(KARAF_DELAY_CONSOLE, new Boolean(this.delayConsoleStart).toString());
}
- private String getProperyOrFail(String propertyName) {
+ private String getPropertyOrFail(String propertyName) {
String value = props.getProperty(propertyName);
if (value == null) {
throw new IllegalArgumentException("Property " + propertyName + " must be set in the etc/" + CONFIG_PROPERTIES_FILE_NAME + " configuration file");
@@ -237,8 +245,8 @@ public class ConfigProperties {
}
private URI getFramework() throws URISyntaxException {
- String framework = getProperyOrFail(KARAF_FRAMEWORK);
- String frameworkBundleUri = getProperyOrFail(KARAF_FRAMEWORK + "." + framework);
+ String framework = getPropertyOrFail(KARAF_FRAMEWORK);
+ String frameworkBundleUri = getPropertyOrFail(KARAF_FRAMEWORK + "." + framework);
return new URI(frameworkBundleUri);
}
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Sun Nov 17 18:15:11 2013
@@ -217,7 +217,7 @@ public class Main {
if (config.delayConsoleStart) {
System.out.println(config.startupMessage);
}
- String log4jConfigPath = System.getProperty("karaf.base") + "/etc/org.ops4j.pax.logging.cfg";
+ String log4jConfigPath = System.getProperty("karaf.etc") + "/org.ops4j.pax.logging.cfg";
BootstrapLogManager.setProperties(config.props, log4jConfigPath);
lock = createLock();
lockCallback = new KarafLockCallback();
@@ -246,7 +246,7 @@ public class Main {
if (framework.getBundleContext().getBundles().length == 1) {
LOG.info("Installing and starting initial bundles");
- File startupPropsFile = new File(config.etcFolder, STARTUP_PROPERTIES_FILE_NAME);
+ File startupPropsFile = new File(config.karafEtc, STARTUP_PROPERTIES_FILE_NAME);
List<BundleInfo> bundles = readBundlesFromStartupProperties(startupPropsFile);
installAndStartBundles(resolver, framework.getBundleContext(), bundles);
LOG.info("All initial bundles installed and set to start");
Modified: karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java (original)
+++ karaf/trunk/obr/command/src/main/java/org/apache/karaf/obr/command/ObrCommandSupport.java Sun Nov 17 18:15:11 2013
@@ -233,9 +233,9 @@ public abstract class ObrCommandSupport
}
sb.append(repo.getURI());
}
- File base = new File(System.getProperty("karaf.base"));
- File sys = new File(base, "etc/config.properties");
- File sysTmp = new File(base, "etc/config.properties.tmp");
+ File etc = new File(System.getProperty("karaf.etc"));
+ File sys = new File(etc, "config.properties");
+ File sysTmp = new File(etc, "config.properties.tmp");
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(sysTmp)));
boolean modified = false;
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sun Nov 17 18:15:11 2013
@@ -205,7 +205,7 @@
<osgi.version>5.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<org.json.version>20131018</org.json.version>
- <pax.exam.version>3.3.0</pax.exam.version>
+ <pax.exam.version>3.4.0-SNAPSHOT</pax.exam.version>
<pax.logging.version>1.7.1</pax.logging.version>
<pax.base.version>1.4.0</pax.base.version>
<pax.url.version>1.6.0</pax.url.version>
Modified: karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java (original)
+++ karaf/trunk/region/persist/src/main/java/org/apache/karaf/region/persist/internal/RegionsPersistenceImpl.java Sun Nov 17 18:15:11 2013
@@ -88,8 +88,8 @@ public class RegionsPersistenceImpl impl
void load() throws IOException, BundleException, JAXBException, InvalidSyntaxException {
if (this.regionDigraph.getRegions().size() <= 1) {
- File base = new File(System.getProperty("karaf.base"));
- File regionsConfig = new File(new File(base, "etc"), "regions-config.xml");
+ File etc = new File(System.getProperty("karaf.etc"));
+ File regionsConfig = new File(etc, "regions-config.xml");
if (regionsConfig.exists()) {
log.info("initializing region digraph from etc/regions-config.xml");
Reader in = new FileReader(regionsConfig);
Modified: karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java (original)
+++ karaf/trunk/shell/console/src/main/java/org/apache/karaf/shell/console/impl/jline/ConsoleImpl.java Sun Nov 17 18:15:11 2013
@@ -225,7 +225,7 @@ public class ConsoleImpl implements Cons
private void setCompletionMode() {
try {
- File shellCfg = new File(System.getProperty("karaf.base"), "/etc/org.apache.karaf.shell.cfg");
+ File shellCfg = new File(System.getProperty("karaf.etc"), "/org.apache.karaf.shell.cfg");
Properties properties = new Properties();
properties.load(new FileInputStream(shellCfg));
if (properties.get("completionMode") != null) {
@@ -234,7 +234,7 @@ public class ConsoleImpl implements Cons
LOGGER.debug("completionMode property is not defined in etc/org.apache.karaf.shell.cfg file. Using default completion mode.");
}
} catch (Exception e) {
- LOGGER.warn("Can't read {}/etc/org.apache.karaf.shell.cfg file. The completion is set to default.", System.getProperty("karaf.base"));
+ LOGGER.warn("Can't read {}/org.apache.karaf.shell.cfg file. The completion is set to default.", System.getProperty("karaf.etc"));
}
}
Modified: karaf/trunk/system/core/src/main/java/org/apache/karaf/system/internal/SystemServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/src/main/java/org/apache/karaf/system/internal/SystemServiceImpl.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/system/core/src/main/java/org/apache/karaf/system/internal/SystemServiceImpl.java (original)
+++ karaf/trunk/system/core/src/main/java/org/apache/karaf/system/internal/SystemServiceImpl.java Sun Nov 17 18:15:11 2013
@@ -162,8 +162,8 @@ public class SystemServiceImpl implement
@Override
public void setName(String name) {
try {
- String karafBase = bundleContext.getProperty("karaf.base");
- File etcDir = new File(karafBase, "etc");
+ String karafEtc = bundleContext.getProperty("karaf.etc");
+ File etcDir = new File(karafEtc);
File syspropsFile = new File(etcDir, "system.properties");
FileInputStream fis = new FileInputStream(syspropsFile);
Properties props = new Properties();
@@ -187,7 +187,7 @@ public class SystemServiceImpl implement
}
private Properties loadProps() throws IOException {
- return new Properties(new File(System.getProperty("karaf.base"), "etc/config.properties"));
+ return new Properties(new File(System.getProperty("karaf.etc"), "config.properties"));
}
public void setFramework(FrameworkType framework) {
@@ -199,7 +199,7 @@ public class SystemServiceImpl implement
properties.put("karaf.framework", framework.name());
properties.save();
} catch (IOException e) {
- throw new RuntimeException("Error settting framework: " + e.getMessage(), e);
+ throw new RuntimeException("Error setting framework: " + e.getMessage(), e);
}
}
@@ -224,8 +224,8 @@ public class SystemServiceImpl implement
public String setSystemProperty(String key, String value, boolean persist) {
if (persist) {
try {
- String base = System.getProperty("karaf.base");
- Properties props = new Properties(new File(base, "etc/system.properties"));
+ String etc = System.getProperty("karaf.etc");
+ Properties props = new Properties(new File(etc, "system.properties"));
props.put(key, value);
props.save();
} catch (IOException e) {
Modified: karaf/trunk/system/core/src/test/java/org/apache/karaf/system/internal/SystemServiceImplTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/system/core/src/test/java/org/apache/karaf/system/internal/SystemServiceImplTest.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/system/core/src/test/java/org/apache/karaf/system/internal/SystemServiceImplTest.java (original)
+++ karaf/trunk/system/core/src/test/java/org/apache/karaf/system/internal/SystemServiceImplTest.java Sun Nov 17 18:15:11 2013
@@ -41,7 +41,7 @@ public class SystemServiceImplTest {
BundleContext bundleContext = EasyMock.createMock(BundleContext.class);
URL propUrl = this.getClass().getClassLoader().getResource("etc/system.properties");
File propfile = new File(propUrl.toURI());
- EasyMock.expect(bundleContext.getProperty("karaf.base")).andReturn(propfile.getParentFile().getParent());
+ EasyMock.expect(bundleContext.getProperty("karaf.etc")).andReturn(propfile.getParentFile().getParent() + "/etc");
EasyMock.replay(bundleContext);
system.setBundleContext(bundleContext);
system.setName(NEW_NAME);
Modified: karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java (original)
+++ karaf/trunk/wrapper/core/src/main/java/org/apache/karaf/wrapper/internal/WrapperServiceImpl.java Sun Nov 17 18:15:11 2013
@@ -42,8 +42,8 @@ public class WrapperServiceImpl implemen
public File[] install(String name, String displayName, String description, String startType) throws Exception {
File base = new File(System.getProperty("karaf.base"));
+ File etc = new File(System.getProperty("karaf.etc"));
File bin = new File(base, "bin");
- File etc = new File(base, "etc");
File lib = new File(base, "lib");
if (name == null) {
@@ -55,6 +55,7 @@ public class WrapperServiceImpl implemen
props.put("${karaf.home}", System.getProperty("karaf.home"));
props.put("${karaf.base}", base.getPath());
props.put("${karaf.data}", System.getProperty("karaf.data"));
+ props.put("${karaf.etc}", System.getProperty("karaf.etc"));
props.put("${name}", name);
props.put("${displayName}", displayName);
props.put("${description}", description);
Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-service Sun Nov 17 18:15:11 2013
@@ -28,7 +28,7 @@ APP_LONG_NAME="${displayName}"
# Wrapper
WRAPPER_CMD="${karaf.base}/bin/${APP_NAME}-wrapper"
-WRAPPER_CONF="${karaf.base}/etc/${APP_NAME}-wrapper.conf"
+WRAPPER_CONF="${karaf.etc}/${APP_NAME}-wrapper.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified.
Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf Sun Nov 17 18:15:11 2013
@@ -22,6 +22,7 @@ set.default.JAVA_HOME=${java.home}
set.default.KARAF_HOME=${karaf.home}
set.default.KARAF_BASE=${karaf.base}
set.default.KARAF_DATA=${karaf.data}
+set.default.KARAF_ETC=${karaf.etc}
# Java Application
wrapper.working.dir=%KARAF_BASE%
@@ -42,11 +43,12 @@ wrapper.java.library.path.1=%KARAF_HOME%
wrapper.java.additional.1=-Dkaraf.home=%KARAF_HOME%
wrapper.java.additional.2=-Dkaraf.base=%KARAF_BASE%
wrapper.java.additional.3=-Dkaraf.data=%KARAF_DATA%
-wrapper.java.additional.4=-Dcom.sun.management.jmxremote
-wrapper.java.additional.5=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.6=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.7=-Djava.endorsed.dirs=%JAVA_HOME%/jre/lib/endorsed:%JAVA_HOME%/lib/endorsed:%KARAF_HOME%/lib/endorsed
-wrapper.java.additional.8=-Djava.ext.dirs=%JAVA_HOME%/jre/lib/ext:%JAVA_HOME%/lib/ext:%KARAF_HOME%/lib/ext
+wrapper.java.additional.4=-Dkaraf.etc=%KARAF_ETC%
+wrapper.java.additional.5=-Dcom.sun.management.jmxremote
+wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.9=-Djava.endorsed.dirs=%JAVA_HOME%/jre/lib/endorsed:%JAVA_HOME%/lib/endorsed:%KARAF_HOME%/lib/endorsed
+wrapper.java.additional.9=-Djava.ext.dirs=%JAVA_HOME%/jre/lib/ext:%JAVA_HOME%/lib/ext:%KARAF_HOME%/lib/ext
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-service.bat Sun Nov 17 18:15:11 2013
@@ -22,6 +22,7 @@ setlocal
set APP_NAME=${name}
set APP_LONG_NAME=${displayName}
set APP_BASE=${karaf.base}
+set APP_ETC=${karaf.etc}
if ""%1"" == ""run"" goto doRun
if ""%1"" == ""install"" goto doInstall
@@ -35,15 +36,15 @@ echo remove Remove the %APP
goto end
:doRun
-"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -c "%APP_BASE%\etc\%APP_NAME%-wrapper.conf"
+"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -c "%APP_ETC%\%APP_NAME%-wrapper.conf"
goto end
:doInstall
-"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -i "%APP_BASE%\etc\%APP_NAME%-wrapper.conf"
+"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -i "%APP_ETC%\%APP_NAME%-wrapper.conf"
goto end
:doRemove
-"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -r "%APP_BASE%\etc\%APP_NAME%-wrapper.conf"
+"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -r "%APP_ETC%\%APP_NAME%-wrapper.conf"
goto end
:end
Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf Sun Nov 17 18:15:11 2013
@@ -22,6 +22,7 @@ set.default.JAVA_HOME=${java.home}
set.default.KARAF_HOME=${karaf.home}
set.default.KARAF_BASE=${karaf.base}
set.default.KARAF_DATA=${karaf.data}
+set.default.KARAF_ETC=${karaf.etc}
# Java Application
wrapper.working.dir=%KARAF_BASE%
@@ -42,11 +43,12 @@ wrapper.java.library.path.1=%KARAF_HOME%
wrapper.java.additional.1=-Dkaraf.home="%KARAF_HOME%"
wrapper.java.additional.2=-Dkaraf.base="%KARAF_BASE%"
wrapper.java.additional.3=-Dkaraf.data="%KARAF_DATA%"
-wrapper.java.additional.4=-Dcom.sun.management.jmxremote
-wrapper.java.additional.5=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.6=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.7=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
-wrapper.java.additional.8=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
+wrapper.java.additional.4=-Dkaraf.etc="%KARAF_ETC%"
+wrapper.java.additional.5=-Dcom.sun.management.jmxremote
+wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.8=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
+wrapper.java.additional.9=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-service.bat Sun Nov 17 18:15:11 2013
@@ -22,6 +22,7 @@ setlocal
set APP_NAME=${name}
set APP_LONG_NAME=${displayName}
set APP_BASE=${karaf.base}
+set APP_ETC=${karaf.etc}
if ""%1"" == ""run"" goto doRun
if ""%1"" == ""install"" goto doInstall
@@ -35,15 +36,15 @@ echo remove Remove the %APP
goto end
:doRun
-"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -c "%APP_BASE%\etc\%APP_NAME%-wrapper.conf"
+"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -c "%APP_ETC%\%APP_NAME%-wrapper.conf"
goto end
:doInstall
-"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -i "%APP_BASE%\etc\%APP_NAME%-wrapper.conf"
+"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -i "%APP_ETC%\%APP_NAME%-wrapper.conf"
goto end
:doRemove
-"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -r "%APP_BASE%\etc\%APP_NAME%-wrapper.conf"
+"%APP_BASE%\bin\%APP_NAME%-wrapper.exe" -r "%APP_ETC%\%APP_NAME%-wrapper.conf"
goto end
:end
Modified: karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf?rev=1542778&r1=1542777&r2=1542778&view=diff
==============================================================================
--- karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf (original)
+++ karaf/trunk/wrapper/core/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf Sun Nov 17 18:15:11 2013
@@ -22,6 +22,7 @@ set.default.JAVA_HOME=${java.home}
set.default.KARAF_HOME=${karaf.home}
set.default.KARAF_BASE=${karaf.base}
set.default.KARAF_DATA=${karaf.data}
+set.default.KARAF_ETC=${karaf.etc}
# Java Application
wrapper.working.dir=%KARAF_BASE%
@@ -42,11 +43,12 @@ wrapper.java.library.path.1=%KARAF_HOME%
wrapper.java.additional.1=-Dkaraf.home="%KARAF_HOME%"
wrapper.java.additional.2=-Dkaraf.base="%KARAF_BASE%"
wrapper.java.additional.3=-Dkaraf.data="%KARAF_DATA%"
-wrapper.java.additional.4=-Dcom.sun.management.jmxremote
-wrapper.java.additional.5=-Dkaraf.startLocalConsole=false
-wrapper.java.additional.6=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.7=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
-wrapper.java.additional.8=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
+wrapper.java.additional.4=-Dkaraf.etc="%KARAF_ETC%"
+wrapper.java.additional.5=-Dcom.sun.management.jmxremote
+wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
+wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
+wrapper.java.additional.8=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
+wrapper.java.additional.9=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616