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/IdentityMapperConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java b/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
index 7d8d220..73243ab 100644
--- a/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opends/src/server/org/opends/server/core/IdentityMapperConfigManager.java
@@ -123,7 +123,7 @@
if (mapperConfiguration.isEnabled())
{
- String className = mapperConfiguration.getMapperClass();
+ String className = mapperConfiguration.getJavaClass();
try
{
IdentityMapper mapper = loadMapper(className, mapperConfiguration,
@@ -169,7 +169,7 @@
{
// Get the name of the class and make sure we can instantiate it as an
// identity mapper.
- String className = configuration.getMapperClass();
+ String className = configuration.getJavaClass();
try
{
loadMapper(className, configuration, false);
@@ -208,7 +208,7 @@
// Get the name of the class and make sure we can instantiate it as an
// identity mapper.
- String className = configuration.getMapperClass();
+ String className = configuration.getJavaClass();
try
{
identityMapper = loadMapper(className, configuration, true);
@@ -283,7 +283,7 @@
{
// Get the name of the class and make sure we can instantiate it as an
// identity mapper.
- String className = configuration.getMapperClass();
+ String className = configuration.getJavaClass();
try
{
loadMapper(className, configuration, false);
@@ -341,7 +341,7 @@
// then we'll at least need to indicate that administrative action is
// required. If the mapper is disabled, then instantiate the class and
// initialize and register it as an identity mapper.
- String className = configuration.getMapperClass();
+ String className = configuration.getJavaClass();
if (existingMapper != null)
{
if (! className.equals(existingMapper.getClass().getName()))
@@ -405,7 +405,7 @@
IdentityMapperCfgDefn definition =
IdentityMapperCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getMapperClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends IdentityMapper> mapperClass =
propertyDefinition.loadClass(className, IdentityMapper.class);
IdentityMapper mapper = mapperClass.newInstance();
--
Gitblit v1.10.0