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/GroupManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/GroupManager.java b/opends/src/server/org/opends/server/core/GroupManager.java
index d50a5d8..894be26 100644
--- a/opends/src/server/org/opends/server/core/GroupManager.java
+++ b/opends/src/server/org/opends/server/core/GroupManager.java
@@ -169,7 +169,7 @@
if (groupConfiguration.isEnabled())
{
- String className = groupConfiguration.getGroupClass();
+ String className = groupConfiguration.getJavaClass();
try
{
Group group = loadGroup(className, groupConfiguration, true);
@@ -197,7 +197,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// group implementation.
- String className = configuration.getGroupClass();
+ String className = configuration.getJavaClass();
try
{
loadGroup(className, configuration, false);
@@ -236,7 +236,7 @@
// Get the name of the class and make sure we can instantiate it as a group
// implementation.
- String className = configuration.getGroupClass();
+ String className = configuration.getJavaClass();
try
{
group = loadGroup(className, configuration, true);
@@ -320,7 +320,7 @@
{
// Get the name of the class and make sure we can instantiate it as a
// group implementation.
- String className = configuration.getGroupClass();
+ String className = configuration.getJavaClass();
try
{
loadGroup(className, configuration, false);
@@ -385,7 +385,7 @@
// changed then we'll at least need to indicate that administrative action
// is required. If the group implementation is disabled, then instantiate
// the class and initialize and register it as a group implementation.
- String className = configuration.getGroupClass();
+ String className = configuration.getJavaClass();
if (existingGroup != null)
{
if (! className.equals(existingGroup.getClass().getName()))
@@ -450,7 +450,7 @@
GroupImplementationCfgDefn definition =
GroupImplementationCfgDefn.getInstance();
ClassPropertyDefinition propertyDefinition =
- definition.getGroupClassPropertyDefinition();
+ definition.getJavaClassPropertyDefinition();
Class<? extends Group> groupClass =
propertyDefinition.loadClass(className, Group.class);
Group group = groupClass.newInstance();
--
Gitblit v1.10.0