Use JAAS config standard system property when set

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / Activator.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
index 51a4cc7a55834a42951bd71671fbcdac32ce96b7..44922aced77eccb4a26f4d84623c3a23d07c2c98 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Activator.java
@@ -57,9 +57,12 @@ public class Activator implements BundleActivator {
        }
 
        private void initSecurity() {
-               URL url = getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG);
-//             URL url = getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG_IPA);
-               System.setProperty("java.security.auth.login.config", url.toExternalForm());
+               if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
+                       URL url = getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG);
+                       // URL url =
+                       // getClass().getClassLoader().getResource(KernelConstants.JAAS_CONFIG_IPA);
+                       System.setProperty(KernelConstants.JAAS_CONFIG_PROP, url.toExternalForm());
+               }
                Configuration.getConfiguration();
        }