From a052caad0008ede711b0c43d9955eccc3bb858ba 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.
---
opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
index 3425e40..819bfb4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java
@@ -30,7 +30,7 @@
import javax.net.ssl.KeyManager;
-import org.opends.server.admin.std.server.KeyManagerCfg;
+import org.opends.server.admin.std.server.KeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.types.DirectoryException;
@@ -45,7 +45,7 @@
* other key manager provider has been defined in the server configuration.
*/
public class NullKeyManagerProvider
- extends KeyManagerProvider<KeyManagerCfg>{
+ extends KeyManagerProvider<KeyManagerProviderCfg>{
@@ -66,7 +66,7 @@
*/
@Override
public void initializeKeyManagerProvider(
- KeyManagerCfg configuration) throws ConfigException,
+ KeyManagerProviderCfg configuration) throws ConfigException,
InitializationException {
// No implementation is required.
}
--
Gitblit v1.10.0