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/VirtualAttributeConfigManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/VirtualAttributeConfigManager.java b/opends/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
index de35a4f..59f130e 100644
--- a/opends/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/opends/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -138,7 +138,7 @@
if (cfg.isEnabled())
{
- String className = cfg.getProviderClass();
+ String className = cfg.getJavaClass();
try
{
VirtualAttributeProvider<? extends VirtualAttributeCfg> provider =
@@ -215,7 +215,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// virtual attribute provider.
- String className = configuration.getProviderClass();
+ String className = configuration.getJavaClass();
try
{
loadProvider(className, configuration, false);
@@ -308,7 +308,7 @@
VirtualAttributeProvider<? extends VirtualAttributeCfg> provider = null;
if (resultCode == ResultCode.SUCCESS)
{
- String className = configuration.getProviderClass();
+ String className = configuration.getJavaClass();
try
{
provider = loadProvider(className, configuration, true);
@@ -384,7 +384,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// virtual attribute provider.
- String className = configuration.getProviderClass();
+ String className = configuration.getJavaClass();
try
{
loadProvider(className, configuration, false);
@@ -489,7 +489,7 @@
VirtualAttributeProvider<? extends VirtualAttributeCfg> provider = null;
if (resultCode == ResultCode.SUCCESS)
{
- String className = configuration.getProviderClass();
+ String className = configuration.getJavaClass();
try
{
provider = loadProvider(className, configuration, true);
@@ -554,7 +554,7 @@
VirtualAttributeCfgDefn definition =
VirtualAttributeCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getProviderClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends VirtualAttributeProvider> providerClass =
propertyDefinition.loadClass(className,
VirtualAttributeProvider.class);
--
Gitblit v1.10.0