From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java b/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
index 810d6f1..4085eb6 100644
--- a/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opends/src/server/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -123,7 +123,7 @@
if (validatorConfiguration.isEnabled())
{
- String className = validatorConfiguration.getValidatorClass();
+ String className = validatorConfiguration.getJavaClass();
try
{
PasswordValidator<? extends PasswordValidatorCfg>
@@ -155,7 +155,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// password validator.
- String className = configuration.getValidatorClass();
+ String className = configuration.getJavaClass();
try
{
loadValidator(className, configuration, false);
@@ -195,7 +195,7 @@
// Get the name of the class and make sure we can instantiate it as a
// password validator.
- String className = configuration.getValidatorClass();
+ String className = configuration.getJavaClass();
try
{
passwordValidator = loadValidator(className, configuration, true);
@@ -271,7 +271,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// password validator.
- String className = configuration.getValidatorClass();
+ String className = configuration.getJavaClass();
try
{
loadValidator(className, configuration, false);
@@ -330,7 +330,7 @@
// changed then we'll at least need to indicate that administrative action
// is required. If the validator is disabled, then instantiate the class
// and initialize and register it as a password validator.
- String className = configuration.getValidatorClass();
+ String className = configuration.getJavaClass();
if (existingValidator != null)
{
if (! className.equals(existingValidator.getClass().getName()))
@@ -396,7 +396,7 @@
PasswordValidatorCfgDefn definition =
PasswordValidatorCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getValidatorClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends PasswordValidator> validatorClass =
propertyDefinition.loadClass(className, PasswordValidator.class);
PasswordValidator<? extends PasswordValidatorCfg> validator =
--
Gitblit v1.10.0