X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fosgi%2FDeployConfig.java;h=71c34932700d3ade3c9f3e0124747264fe4de11e;hb=4672ec9d1071dffc7c591f623898d32a31637d04;hp=c36658e116c9a009bf5e22c041972d6acdff9f5e;hpb=73ff3654ba6d4a8381b9be5594d0d56f214fac58;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
index c36658e11..71c349327 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/DeployConfig.java
@@ -27,9 +27,9 @@ import org.argeo.cms.internal.runtime.InitUtils;
 import org.argeo.cms.internal.runtime.KernelConstants;
 import org.argeo.cms.internal.runtime.KernelUtils;
 import org.argeo.osgi.useradmin.UserAdminConf;
-import org.argeo.util.naming.AttributesDictionary;
-import org.argeo.util.naming.LdifParser;
-import org.argeo.util.naming.LdifWriter;
+import org.argeo.util.naming.ldap.AttributesDictionary;
+import org.argeo.util.naming.ldap.LdifParser;
+import org.argeo.util.naming.ldap.LdifWriter;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
@@ -37,15 +37,6 @@ import org.osgi.service.cm.ConfigurationEvent;
 
 /** Manages the LDIF-based deployment configuration. */
 public class DeployConfig {
-	private final static LdapName USER_ADMIN_BASE_DN;
-	static {
-		try {
-			USER_ADMIN_BASE_DN = new LdapName(
-					CmsConstants.OU + "=" + CmsConstants.NODE_USER_ADMIN_PID + "," + CmsConstants.DEPLOY_BASEDN);
-		} catch (InvalidNameException e) {
-			throw new IllegalArgumentException(e);
-		}
-	}
 
 	private final CmsLog log = CmsLog.getLog(getClass());
 //	private final BundleContext bc = FrameworkUtil.getBundle(getClass()).getBundleContext();
@@ -269,6 +260,14 @@ public class DeployConfig {
 	}
 
 	public Set<Dictionary<String, Object>> getUserDirectoryConfigs() {
+		// not static because class is not supported by Android
+		final LdapName USER_ADMIN_BASE_DN;
+		try {
+			USER_ADMIN_BASE_DN = new LdapName(
+					CmsConstants.OU + "=" + CmsConstants.NODE_USER_ADMIN_PID + "," + CmsConstants.DEPLOY_BASEDN);
+		} catch (InvalidNameException e) {
+			throw new IllegalArgumentException(e);
+		}
 		Set<Dictionary<String, Object>> res = new HashSet<>();
 		for (LdapName dn : deployConfigs.keySet()) {
 			if (dn.endsWith(USER_ADMIN_BASE_DN)) {