BUG-3553 Introduce custom java.security config file

[controller.git] / karaf / opendaylight-karaf-resources / src / main / resources / bin / karaf.bat

diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
index 9c278c3b9ad366ecfe183d932ee153139b75c192..a5c254a0bf5bfef67a17ac0d48e1a24def1728b2 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
@@ -219,8 +219,15 @@ if not exist "%JAVA_HOME%\bin\server\jvm.dll" (
         set JAVA_MODE=-client\r
     )\r
 )\r
+\r
 set DEFAULT_JAVA_OPTS=%JAVA_MODE% -Xms%JAVA_MIN_MEM% -Xmx%JAVA_MAX_MEM% -Dderby.system.home="%KARAF_DATA%\derby" -Dderby.storage.fileSyncTransactionLog=true -Dcom.sun.management.jmxremote  -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass\r
 \r
+if not "%ODL_JAVA_SECURITY_PROPERTIES%" == "" (\r
+    set DEFAULT_JAVA_OPTS=-Djava.security.properties="%ODL_JAVA_SECURITY_PROPERTIES%" %DEFAULT_JAVA_OPTS%\r
+) else (\r
+    set DEFAULT_JAVA_OPTS=-Djava.security.properties="%KARAF_ETC%\odl.java.security" %DEFAULT_JAVA_OPTS%\r
+)\r
+\r
 rem Check some easily accessible MIN/MAX params for JVM mem usage\r
 if not "%JAVA_PERM_MEM%" == "" (\r
     set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:PermSize=%JAVA_PERM_MEM%\r