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/SASLConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/SASLConfigManager.java b/opends/src/server/org/opends/server/core/SASLConfigManager.java
index 31d921f..5d15243 100644
--- a/opends/src/server/org/opends/server/core/SASLConfigManager.java
+++ b/opends/src/server/org/opends/server/core/SASLConfigManager.java
@@ -126,7 +126,7 @@
if (handlerConfiguration.isEnabled())
{
- String className = handlerConfiguration.getHandlerClass();
+ String className = handlerConfiguration.getJavaClass();
try
{
SASLMechanismHandler handler = loadHandler(className,
@@ -156,7 +156,7 @@
{
// Get the name of the class and make sure we can instantiate it as a SASL
// mechanism handler.
- String className = configuration.getHandlerClass();
+ String className = configuration.getJavaClass();
try
{
loadHandler(className, configuration, false);
@@ -195,7 +195,7 @@
// Get the name of the class and make sure we can instantiate it as a SASL
// mechanism handler.
- String className = configuration.getHandlerClass();
+ String className = configuration.getJavaClass();
try
{
handler = loadHandler(className, configuration, true);
@@ -266,7 +266,7 @@
{
// Get the name of the class and make sure we can instantiate it as a SASL
// mechanism handler.
- String className = configuration.getHandlerClass();
+ String className = configuration.getJavaClass();
try
{
loadHandler(className, configuration, false);
@@ -321,7 +321,7 @@
// then we'll at least need to indicate that administrative action is
// required. If the handler is disabled, then instantiate the class and
// initialize and register it as a SASL mechanism handler.
- String className = configuration.getHandlerClass();
+ String className = configuration.getJavaClass();
if (existingHandler != null)
{
if (! className.equals(existingHandler.getClass().getName()))
@@ -384,7 +384,7 @@
SASLMechanismHandlerCfgDefn definition =
SASLMechanismHandlerCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getHandlerClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends SASLMechanismHandler> handlerClass =
propertyDefinition.loadClass(className, SASLMechanismHandler.class);
SASLMechanismHandler handler = handlerClass.newInstance();
--
Gitblit v1.10.0