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

diff --git a/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java b/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
index 3168aa3..1426e99 100644
--- a/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opends/src/server/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -212,7 +212,7 @@
           }
 
           messages.add(ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(
-                  String.valueOf(configuration.getJavaImplementationClass()),
+                  String.valueOf(configuration.getJavaClass()),
                   String.valueOf(configuration.dn())));
           resultCode = DirectoryServer.getServerErrorResultCode();
         }
@@ -227,7 +227,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(provider.getClass().getName()))
         {
           adminActionRequired = true;
@@ -319,7 +319,7 @@
         }
 
         messages.add(ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(
-                String.valueOf(configuration.getJavaImplementationClass()),
+                String.valueOf(configuration.getJavaClass()),
                            String.valueOf(configuration.dn())));
         resultCode = DirectoryServer.getServerErrorResultCode();
       }
@@ -365,11 +365,11 @@
     getSynchronizationProvider(SynchronizationProviderCfg configuration)
     throws ConfigException
   {
-    String className = configuration.getJavaImplementationClass();
+    String className = configuration.getJavaClass();
     SynchronizationProviderCfgDefn d =
       SynchronizationProviderCfgDefn.getInstance();
     ClassPropertyDefinition pd =
-      d.getJavaImplementationClassPropertyDefinition();
+      d.getJavaClassPropertyDefinition();
 
     // Load the class
     Class<? extends SynchronizationProvider> theClass;
@@ -426,11 +426,11 @@
       SynchronizationProviderCfg configuration,
       List<Message> unacceptableReasons)
   {
-    String className = configuration.getJavaImplementationClass();
+    String className = configuration.getJavaClass();
     SynchronizationProviderCfgDefn d =
       SynchronizationProviderCfgDefn.getInstance();
     ClassPropertyDefinition pd =
-      d.getJavaImplementationClassPropertyDefinition();
+      d.getJavaClassPropertyDefinition();
 
     // Load the class and cast it to a synchronizationProvider.
     SynchronizationProvider provider = null;

--
Gitblit v1.10.0