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/TrustManagerProvider.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/api/TrustManagerProvider.java b/opends/src/server/org/opends/server/api/TrustManagerProvider.java
index 1ab1d42..eeb02ea 100644
--- a/opends/src/server/org/opends/server/api/TrustManagerProvider.java
+++ b/opends/src/server/org/opends/server/api/TrustManagerProvider.java
@@ -32,7 +32,7 @@
import java.util.List;
import javax.net.ssl.TrustManager;
-import org.opends.server.admin.std.server.TrustManagerCfg;
+import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.config.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
@@ -52,7 +52,8 @@
mayInstantiate=false,
mayExtend=true,
mayInvoke=true)
-public abstract class TrustManagerProvider<T extends TrustManagerCfg>
+public abstract class TrustManagerProvider<T extends
+ TrustManagerProviderCfg>
{
/**
* Initializes this trust manager provider based on the information
@@ -100,7 +101,7 @@
* not.
*/
public boolean isConfigurationAcceptable(
- TrustManagerCfg configuration,
+ TrustManagerProviderCfg configuration,
List<Message> unacceptableReasons)
{
// This default implementation does not perform any special
--
Gitblit v1.10.0