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/ExtendedOperationConfigManager.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java b/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
index 10bc93c..840fc45 100644
--- a/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opends/src/server/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -222,7 +222,7 @@
           }
 
           messages.add(ERR_CONFIG_EXTOP_INITIALIZATION_FAILED.get(
-                  String.valueOf(configuration.getJavaImplementationClass()),
+                  String.valueOf(configuration.getJavaClass()),
                   String.valueOf(dn),
                   stackTraceToSingleLineString(e)));
           resultCode = DirectoryServer.getServerErrorResultCode();
@@ -235,7 +235,7 @@
         // applied dynamically, so if the class name did change then
         // indicate that administrative action is required for that
         // change to take effect.
-        String className = configuration.getJavaImplementationClass();
+        String className = configuration.getJavaClass();
         if (!className.equals(handler.getClass().getName())) {
           adminActionRequired = true;
         }
@@ -310,7 +310,7 @@
         }
 
         messages.add(ERR_CONFIG_EXTOP_INITIALIZATION_FAILED.get(
-                String.valueOf(configuration.getJavaImplementationClass()),
+                String.valueOf(configuration.getJavaClass()),
                 String.valueOf(dn),
                 stackTraceToSingleLineString(e)));
         resultCode = DirectoryServer.getServerErrorResultCode();
@@ -337,11 +337,11 @@
   private ExtendedOperationHandler getHandler(
       ExtendedOperationHandlerCfg config) throws ConfigException
   {
-    String className = config.getJavaImplementationClass();
+    String className = config.getJavaClass();
     ExtendedOperationHandlerCfgDefn d =
       ExtendedOperationHandlerCfgDefn.getInstance();
     ClassPropertyDefinition pd = d
-        .getJavaImplementationClassPropertyDefinition();
+        .getJavaClassPropertyDefinition();
 
     // Load the class and cast it to an extended operation handler.
     Class<? extends ExtendedOperationHandler> theClass;
@@ -385,11 +385,11 @@
   private boolean isJavaClassAcceptable(ExtendedOperationHandlerCfg config,
                                         List<Message> unacceptableReasons)
   {
-    String className = config.getJavaImplementationClass();
+    String className = config.getJavaClass();
     ExtendedOperationHandlerCfgDefn d =
       ExtendedOperationHandlerCfgDefn.getInstance();
     ClassPropertyDefinition pd = d
-        .getJavaImplementationClassPropertyDefinition();
+        .getJavaClassPropertyDefinition();
 
     // Load the class and cast it to an extended operation handler.
     Class<? extends ExtendedOperationHandler> theClass;

--
Gitblit v1.10.0