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/PasswordStorageSchemeConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index 14600f0..c0a87bc 100644
--- a/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opends/src/server/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -125,7 +125,7 @@
if (config.isEnabled())
{
// Load the password storage scheme implementation class.
- String className = config.getSchemeClass();
+ String className = config.getJavaClass();
loadAndInstallPasswordStorageScheme (className, config);
}
}
@@ -148,7 +148,7 @@
{
// Get the name of the class and make sure we can instantiate it as
// a password storage scheme.
- String className = configuration.getSchemeClass();
+ String className = configuration.getJavaClass();
try
{
// Load the class but don't initialize it.
@@ -201,7 +201,7 @@
// If the current password storage scheme is already enabled then we
// don't do anything unless the class has changed in which case we
// should indicate that administrative action is required.
- String newClassName = configuration.getSchemeClass();
+ String newClassName = configuration.getJavaClass();
if (storageScheme != null)
{
String curClassName = storageScheme.getClass().getName();
@@ -257,7 +257,7 @@
{
// Get the name of the class and make sure we can instantiate it as
// an entry cache.
- String className = configuration.getSchemeClass();
+ String className = configuration.getJavaClass();
try
{
// Load the class but don't initialize it.
@@ -295,7 +295,7 @@
{
// Instantiate the class as password storage scheme
// and initialize it.
- String className = configuration.getSchemeClass();
+ String className = configuration.getJavaClass();
try
{
loadAndInstallPasswordStorageScheme (className, configuration);
@@ -410,7 +410,7 @@
passwordStorageScheme;
definition = PasswordStorageSchemeCfgDefn.getInstance();
- propertyDefinition = definition.getSchemeClassPropertyDefinition();
+ propertyDefinition = definition.getJavaClassPropertyDefinition();
schemeClass = propertyDefinition.loadClass(
className,
PasswordStorageScheme.class
--
Gitblit v1.10.0