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/extensions/NullTrustManagerProvider.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java b/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
index 70777e5..887864d 100644
--- a/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
+++ b/opends/src/server/org/opends/server/extensions/NullTrustManagerProvider.java
@@ -30,7 +30,7 @@
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.api.TrustManagerProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.types.DirectoryException;
@@ -46,7 +46,7 @@
* configuration.
*/
public class NullTrustManagerProvider
- extends TrustManagerProvider<TrustManagerCfg>
+ extends TrustManagerProvider<TrustManagerProviderCfg>
{
/**
* Creates a new instance of this null trust manager provider. The
@@ -63,7 +63,8 @@
/**
* {@inheritDoc}
*/
- public void initializeTrustManagerProvider(TrustManagerCfg configuration)
+ public void initializeTrustManagerProvider(
+ TrustManagerProviderCfg configuration)
throws ConfigException, InitializationException
{
// No implementation is required.
--
Gitblit v1.10.0