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/AccessControlConfigManager.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/AccessControlConfigManager.java b/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
index 07a2d42..ad4b8da 100644
--- a/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
+++ b/opends/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -212,7 +212,7 @@
// Initialization phase.
if (newConfiguration.isEnabled())
{
- newHandlerClass = newConfiguration.getAclHandlerClass();
+ newHandlerClass = newConfiguration.getJavaClass();
}
else
{
@@ -227,7 +227,7 @@
if ((! enabledOld) && enabledNew)
{
// Access control has been enabled - get the new class name.
- newHandlerClass = newConfiguration.getAclHandlerClass();
+ newHandlerClass = newConfiguration.getJavaClass();
}
else if (enabledOld && (! enabledNew))
{
@@ -239,7 +239,7 @@
{
// Access control is already enabled, but still get the handler class
// name to see if it has changed.
- newHandlerClass = newConfiguration.getAclHandlerClass();
+ newHandlerClass = newConfiguration.getJavaClass();
}
}
@@ -325,7 +325,7 @@
// can load the access control handler class.
if (configuration.isEnabled())
{
- loadHandler(configuration.getAclHandlerClass(), configuration, false);
+ loadHandler(configuration.getJavaClass(), configuration, false);
}
}
catch (InitializationException e)
@@ -434,7 +434,7 @@
AccessControlHandlerCfgDefn definition =
AccessControlHandlerCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getAclHandlerClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends AccessControlHandler> providerClass =
propertyDefinition.loadClass(className, AccessControlHandler.class);
AccessControlHandler<? extends AccessControlHandlerCfg> provider =
--
Gitblit v1.10.0