Author: davidb
Date: Tue Nov 26 10:53:41 2013
New Revision: 1545607
URL: http://svn.apache.org/r1545607
Log:
Enable JMX RBAC by default (just like on the 3.x branch)
Modified:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
Modified:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf?rev=1545607&r1=1545606&r2=1545607&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
Tue Nov 26 10:53:41 2013
@@ -395,12 +395,7 @@ run() {
fi
cd "$KARAF_BASE"
- if [ "x$KARAF_ACL" != "x" ]; then
- warn "Enabling JMX Role-Based Access Control"
- 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_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" -Dkaraf.etc="$KARAF_ETC"
-Djava.io.tmpdir="$KARAF_DATA/tmp"
-Djava.util.logging.config.file="$KARAF_ETC/java.util.logging.properties"
$KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN "$@"
- fi
+ 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_ETC/java.util.logging.properties"
-Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder
$KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN "$@"
}
main() {
Modified:
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat?rev=1545607&r1=1545606&r2=1545607&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
(original)
+++
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/distribution/windows-text/bin/karaf.bat
Tue Nov 26 10:53:41 2013
@@ -324,12 +324,7 @@ if "%KARAF_PROFILER%" == "" goto :RUN
SET ARGS=%1 %2 %3 %4 %5 %6 %7 %8
rem Execute the Java Virtual Machine
cd %KARAF_BASE%
- 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%" -Dkaraf.etc="%KARAF_ETC%"
-Djava.util.logging.config.file="%KARAF_ETC%\java.util.logging.properties"
%KARAF_OPTS% %MAIN% %ARGS%
- ) else (
- echo Enabling JMX Role-Based Access Control
- "%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%" -Dkaraf.etc="%KARAF_ETC%"
-Djava.util.logging.config.file="%KARAF_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%" -Djava.io.tmpdir="%KARAF_DATA%\tmp"
-Dkaraf.data="%KARAF_DATA%" -Dkaraf.etc="%KARAF_ETC%"
-Djava.util.logging.config.file="%KARAF_ETC%\java.util.logging.properties"
-Djavax.management.builder.initial=org.apache.karaf.management.boot.KarafMBeanServerBuilder
%KARAF_OPTS% %MAIN% %ARGS%
rem # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
