Prepare next development cycle

[lgpl/argeo-commons.git] / org.argeo.util / src / org / argeo / osgi / useradmin / AbstractUserDirectory.java

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java b/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
index 7279877e0e8ec46690a7f95b72ba062b234f8a34..e028e384e1a8a7af1b5656124e0a66e6f50e9c00 100644 (file)
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
@@ -1,11 +1,11 @@
 package org.argeo.osgi.useradmin;
 
-import static org.argeo.naming.LdapAttrs.objectClass;
-import static org.argeo.naming.LdapObjs.extensibleObject;
-import static org.argeo.naming.LdapObjs.inetOrgPerson;
-import static org.argeo.naming.LdapObjs.organizationalPerson;
-import static org.argeo.naming.LdapObjs.person;
-import static org.argeo.naming.LdapObjs.top;
+import static org.argeo.util.naming.LdapAttrs.objectClass;
+import static org.argeo.util.naming.LdapObjs.extensibleObject;
+import static org.argeo.util.naming.LdapObjs.inetOrgPerson;
+import static org.argeo.util.naming.LdapObjs.organizationalPerson;
+import static org.argeo.util.naming.LdapObjs.person;
+import static org.argeo.util.naming.LdapObjs.top;
 
 import java.io.File;
 import java.net.URI;
@@ -28,8 +28,8 @@ import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
-import org.argeo.naming.LdapAttrs;
 import org.argeo.osgi.transaction.WorkControl;
+import org.argeo.util.naming.LdapAttrs;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
@@ -67,6 +67,8 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
        private WorkControl transactionControl;
        private WcXaResource xaResource = new WcXaResource(this);
 
+       private String forcedPassword;
+
        AbstractUserDirectory(URI uriArg, Dictionary<String, ?> props, boolean scoped) {
                this.scoped = scoped;
                properties = new Hashtable<String, Object>();
@@ -86,6 +88,8 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
                                uri = uriStr;
                }
 
+               forcedPassword = UserAdminConf.forcedPassword.getValue(properties);
+
                userObjectClass = UserAdminConf.userObjectClass.getValue(properties);
                userBase = UserAdminConf.userBase.getValue(properties);
                groupObjectClass = UserAdminConf.groupObjectClass.getValue(properties);
@@ -494,6 +498,10 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 //             this.transactionManager = transactionManager;
 //     }
 
+       public String getForcedPassword() {
+               return forcedPassword;
+       }
+
        public void setTransactionControl(WorkControl transactionControl) {
                this.transactionControl = transactionControl;
        }