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/PluginConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/PluginConfigManager.java b/opends/src/server/org/opends/server/core/PluginConfigManager.java
index e65bf24..edc1c3c 100644
--- a/opends/src/server/org/opends/server/core/PluginConfigManager.java
+++ b/opends/src/server/org/opends/server/core/PluginConfigManager.java
@@ -355,7 +355,7 @@
try
{
DirectoryServerPlugin<? extends PluginCfg> plugin =
- loadPlugin(pluginConfiguration.getPluginClass(), initTypes,
+ loadPlugin(pluginConfiguration.getJavaClass(), initTypes,
pluginConfiguration, true);
registerPlugin(plugin, pluginConfiguration.dn(), initTypes);
}
@@ -402,7 +402,7 @@
PluginCfgDefn definition =
PluginCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getPluginClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends DirectoryServerPlugin> pluginClass =
propertyDefinition.loadClass(className, DirectoryServerPlugin.class);
DirectoryServerPlugin<? extends PluginCfg> plugin =
@@ -5261,7 +5261,7 @@
// Get the name of the class and make sure we can instantiate it as a
// plugin.
- String className = configuration.getPluginClass();
+ String className = configuration.getJavaClass();
try
{
loadPlugin(className, pluginTypes, configuration, false);
@@ -5307,7 +5307,7 @@
// Get the name of the class and make sure we can instantiate it as a
// plugin.
DirectoryServerPlugin<? extends PluginCfg> plugin = null;
- String className = configuration.getPluginClass();
+ String className = configuration.getJavaClass();
try
{
plugin = loadPlugin(className, pluginTypes, configuration, true);
@@ -5381,7 +5381,7 @@
// Get the name of the class and make sure we can instantiate it as a
// plugin.
- String className = configuration.getPluginClass();
+ String className = configuration.getJavaClass();
try
{
loadPlugin(className, pluginTypes, configuration, false);
@@ -5434,7 +5434,7 @@
// required. If the mapper is disabled, then instantiate the class and
// initialize and register it as an identity mapper. Also, update the
// plugin to indicate whether it should be invoked for internal operations.
- String className = configuration.getPluginClass();
+ String className = configuration.getJavaClass();
if (existingPlugin != null)
{
if (! className.equals(existingPlugin.getClass().getName()))
--
Gitblit v1.10.0