From feb5d90ec016c99712f19c5485cf7633cd38f111 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 23 Mar 2007 14:26:04 +0000
Subject: [PATCH] Merge admin framework from config-prototype-branch onto trunk.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index ab1eea4..775b08e 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -39,9 +39,11 @@
 import org.testng.annotations.Test;
 
 import org.opends.server.TestCaseUtils;
+import org.opends.server.admin.server.AdminTestCaseUtils;
+import org.opends.server.admin.std.meta.PluginCfgDefn;
+import org.opends.server.admin.std.server.PluginCfg;
 import org.opends.server.api.plugin.DirectoryServerPlugin;
 import org.opends.server.api.plugin.PluginType;
-import org.opends.server.config.ConfigEntry;
 import org.opends.server.config.ConfigException;
 import org.opends.server.core.AddOperation;
 import org.opends.server.core.DirectoryServer;
@@ -154,12 +156,13 @@
     }
 
 
-    ConfigEntry parentEntry =
-         DirectoryConfig.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
-    ConfigEntry configEntry = new ConfigEntry(e, parentEntry);
+    PluginCfg configuration =
+         AdminTestCaseUtils.getConfiguration(
+              PluginCfgDefn.getInstance(), e);
 
     EntryUUIDPlugin plugin = new EntryUUIDPlugin();
-    plugin.initializePlugin(pluginTypes, configEntry);
+    plugin.initializePlugin(pluginTypes, configuration);
+    plugin.finalizePlugin();
   }
 
 
@@ -192,12 +195,13 @@
     }
 
 
-    ConfigEntry parentEntry =
-         DirectoryConfig.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
-    ConfigEntry configEntry = new ConfigEntry(e, parentEntry);
+    PluginCfg configuration =
+         AdminTestCaseUtils.getConfiguration(
+              PluginCfgDefn.getInstance(), e);
 
     EntryUUIDPlugin plugin = new EntryUUIDPlugin();
-    plugin.initializePlugin(pluginTypes, configEntry);
+    plugin.initializePlugin(pluginTypes, configuration);
+    plugin.finalizePlugin();
 
 
     DirectoryServer.registerAttributeType(entryUUIDType, false);
@@ -269,12 +273,12 @@
     }
 
 
-    ConfigEntry parentEntry =
-         DirectoryConfig.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
-    ConfigEntry configEntry = new ConfigEntry(e, parentEntry);
+    PluginCfg configuration =
+         AdminTestCaseUtils.getConfiguration(
+              PluginCfgDefn.getInstance(), e);
 
     EntryUUIDPlugin plugin = new EntryUUIDPlugin();
-    plugin.initializePlugin(pluginTypes, configEntry);
+    plugin.initializePlugin(pluginTypes, configuration);
   }
 
 

--
Gitblit v1.10.0