Author: jbonofre
Date: Thu Nov 7 15:15:05 2013
New Revision: 1539675
URL: http://svn.apache.org/r1539675
Log:
Add KARAF_ACL to disable/enable the ACL support
Modified:
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
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=1539675&r1=1539674&r2=1539675&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
Thu Nov 7 15:15:05 2013
@@ -393,7 +393,13 @@ run() {
JAVA_EXT_DIRS=`cygpath --path --windows "$JAVA_EXT_DIRS"`
fi
cd "$KARAF_BASE"
- 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 "$@"
+
+ 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 "$@"
+ 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 "$@"
+ fi
}
main() {
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=1539675&r1=1539674&r2=1539675&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
Thu Nov 7 15:15:05 2013
@@ -312,7 +312,12 @@ if "%KARAF_PROFILER%" == "" goto :RUN
SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
cd "%KARAF_BASE%"
- "%JAVA%" %JAVA_OPTS% %OPTS% -classpath "%CLASSPATH%"
-Djava.endorsed.dirs="%JAVA_HOME%\jre\lib\endorsed;%JAVA_HOME%\lib\endorsed;%KARAF_HOME%\lib\endorsed"
-Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%JAVA_HOME%\lib\ext;%KARAF_HOME%\lib\ext"
-Dkaraf.instances="%KARAF_HOME%\instances" -Dkaraf.home="%KARAF_HOME%"
-Dkaraf.base="%KARAF_BASE%" -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%
+ 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%
+ ) else (
+ rem 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%
+ )
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
