Use JAAS config standard system property when set

git-svn-id: https://svn.argeo.org/commons/trunk@9327 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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();
        }
 

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
index 1d98772ed0f07766f004825ffacb36bef16bb31e..e01bd2c54b8b88750b819685d415c1177bb49faa 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
@@ -60,7 +60,7 @@ public class CmsState implements NodeState {
                try {
                        this.hostname = InetAddress.getLocalHost().getHostName();
                } catch (UnknownHostException e) {
-                       log.error("Cannot set hostname", e);
+                       log.error("Cannot set hostname: "+ e);
                }
 
                availableSince = System.currentTimeMillis();

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
index 4ed9e4efdff10e97273d2e2e0aa98bd43054e415..12c17833daf432d5deb476f70d7113ee8c65f8ba 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelConstants.java
@@ -16,11 +16,11 @@ public interface KernelConstants {
        String DEPLOY_CONFIG_PATH = KernelConstants.DIR_NODE + '/' + NodeConstants.DEPLOY_BASEDN + ".ldif";
 
        // Security
-//     String DEFAULT_SECURITY_KEY = "argeo";
+       // String DEFAULT_SECURITY_KEY = "argeo";
        String JAAS_CONFIG = "/org/argeo/cms/internal/kernel/jaas.cfg";
        String JAAS_CONFIG_IPA = "/org/argeo/cms/internal/kernel/jaas-ipa.cfg";
-//     String LOGIN_CONTEXT_KERNEL = "KERNEL";
-//     String LOGIN_CONTEXT_HARDENED_KERNEL = "HARDENED_KERNEL";
+       // String LOGIN_CONTEXT_KERNEL = "KERNEL";
+       // String LOGIN_CONTEXT_HARDENED_KERNEL = "HARDENED_KERNEL";
 
        // DAV
        String WEBDAV_CONFIG = "/org/argeo/cms/internal/kernel/webdav-config.xml";
@@ -30,6 +30,9 @@ public interface KernelConstants {
        // String REMOTING_PUBLIC = PATH_DATA + "/pub";
        // String REMOTING_PRIVATE = PATH_DATA + "/jcr";
 
+       // Java
+       String JAAS_CONFIG_PROP = "java.security.auth.login.config";
+
        // RWT / RAP
        String PATH_WORKBENCH = "/ui";
        String PATH_WORKBENCH_PUBLIC = PATH_WORKBENCH + "/public";