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/api/KeyManagerProvider.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/api/KeyManagerProvider.java b/opends/src/server/org/opends/server/api/KeyManagerProvider.java
index 73b8a94..0d83305 100644
--- a/opends/src/server/org/opends/server/api/KeyManagerProvider.java
+++ b/opends/src/server/org/opends/server/api/KeyManagerProvider.java
@@ -32,7 +32,7 @@
import java.util.List;
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.config.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
@@ -54,7 +54,7 @@
mayExtend=true,
mayInvoke=true)
public abstract class KeyManagerProvider
- <T extends KeyManagerCfg>
+ <T extends KeyManagerProviderCfg>
{
/**
* Initializes this key manager provider based on the information in
--
Gitblit v1.10.0