Use no IPA JAAS as default

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

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
index 07c10f486045f64d0d7adf120367b2af08a93c13..10ebb603a10ea4c57a42c92418546940f4cdfe94 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsDeployment.java
@@ -103,25 +103,27 @@ public class CmsDeployment implements NodeDeployment {
                                deployConfig = new DeployConfig(configurationAdmin, cleanState);
                                httpExpected = deployConfig.getProps(KernelConstants.JETTY_FACTORY_PID, "default") != null;
                                try {
+                                       // Configuration[] configs = configurationAdmin
+                                       // .listConfigurations("(service.factoryPid=" +
+                                       // NodeConstants.NODE_REPOS_FACTORY_PID + ")");
+                                       // for (Configuration config : configs) {
+                                       // Object cn = config.getProperties().get(NodeConstants.CN);
+                                       // if (log.isDebugEnabled())
+                                       // log.debug("Standalone repo cn: " + cn);
+                                       // }
                                        Configuration[] configs = configurationAdmin
-                                                       .listConfigurations("(service.factoryPid=" + NodeConstants.NODE_REPOS_FACTORY_PID + ")");
-                                       for (Configuration config : configs) {
-                                               Object cn = config.getProperties().get(NodeConstants.CN);
-                                               log.debug("Standalone repo cn: " + cn);
-                                       }
-                                       configs = configurationAdmin
                                                        .listConfigurations("(service.factoryPid=" + NodeConstants.NODE_USER_ADMIN_PID + ")");
 
                                        boolean hasDomain = false;
                                        for (Configuration config : configs) {
                                                Object realm = config.getProperties().get(UserAdminConf.realm.name());
                                                if (realm != null) {
-                                                       log.debug("Realm: " + realm);
+                                                       log.debug("Found realm: " + realm);
                                                        hasDomain = true;
                                                }
                                        }
-                                       if (!hasDomain) {
-                                               loadNoIpaJaasConfiguration();
+                                       if (hasDomain) {
+                                               loadIpaJaasConfiguration();
                                        }
                                } catch (Exception e) {
                                        throw new CmsException("Cannot initialize config", e);
@@ -131,13 +133,12 @@ public class CmsDeployment implements NodeDeployment {
                }.open();
        }
 
-       private void loadNoIpaJaasConfiguration() {
+       private void loadIpaJaasConfiguration() {
                if (System.getProperty(KernelConstants.JAAS_CONFIG_PROP) == null) {
-                       String jaasConfig = KernelConstants.JAAS_CONFIG_NOIPA;
+                       String jaasConfig = KernelConstants.JAAS_CONFIG_IPA;
                        URL url = getClass().getClassLoader().getResource(jaasConfig);
                        KernelUtils.setJaasConfiguration(url);
-                       if (log.isDebugEnabled())
-                               log.debug("Set no-IPA JAAS configuration.");
+                       log.debug("Set IPA JAAS configuration.");
                }
        }