From feb5d90ec016c99712f19c5485cf7633cd38f111 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 23 Mar 2007 14:26:04 +0000
Subject: [PATCH] Merge admin framework from config-prototype-branch onto trunk.
---
opends/src/server/org/opends/server/core/PasswordPolicy.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordPolicy.java b/opends/src/server/org/opends/server/core/PasswordPolicy.java
index abf8cbd..c58270f 100644
--- a/opends/src/server/org/opends/server/core/PasswordPolicy.java
+++ b/opends/src/server/org/opends/server/core/PasswordPolicy.java
@@ -39,6 +39,7 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
+import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.api.PasswordGenerator;
import org.opends.server.api.PasswordStorageScheme;
@@ -144,8 +145,11 @@
new ConcurrentHashMap<DN, AccountStatusNotificationHandler>();
// The set of password validators that will be used with this password policy.
- private ConcurrentHashMap<DN,PasswordValidator> passwordValidators =
- new ConcurrentHashMap<DN,PasswordValidator>();
+ private ConcurrentHashMap<DN,
+ PasswordValidator<? extends PasswordValidatorCfg>>
+ passwordValidators =
+ new ConcurrentHashMap<DN,PasswordValidator<? extends
+ PasswordValidatorCfg>>();
// The set of default password storage schemes for this password policy.
private CopyOnWriteArrayList<PasswordStorageScheme> defaultStorageSchemes =
@@ -435,12 +439,16 @@
(DNConfigAttribute) configEntry.getConfigAttribute(validatorStub);
if (validatorAttr != null)
{
- ConcurrentHashMap<DN,PasswordValidator> validators =
- new ConcurrentHashMap<DN,PasswordValidator>();
+ ConcurrentHashMap<DN,
+ PasswordValidator<? extends PasswordValidatorCfg>>
+ validators =
+ new ConcurrentHashMap<DN,
+ PasswordValidator<? extends
+ PasswordValidatorCfg>>();
for (DN validatorDN : validatorAttr.pendingValues())
{
- PasswordValidator validator =
- DirectoryServer.getPasswordValidator(validatorDN);
+ PasswordValidator<? extends PasswordValidatorCfg>
+ validator = DirectoryServer.getPasswordValidator(validatorDN);
if (validator == null)
{
msgID = MSGID_PWPOLICY_NO_SUCH_VALIDATOR;
@@ -1553,7 +1561,9 @@
*
* @return The set of password validators for this password policy.
*/
- public ConcurrentHashMap<DN,PasswordValidator> getPasswordValidators()
+ public ConcurrentHashMap<DN,
+ PasswordValidator<? extends PasswordValidatorCfg>>
+ getPasswordValidators()
{
return passwordValidators;
}
--
Gitblit v1.10.0