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/FileBasedTrustManagerProvider.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index c642482..aa6832f 100644
--- a/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -42,8 +42,8 @@
import javax.net.ssl.X509TrustManager;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.TrustManagerCfg;
-import org.opends.server.admin.std.server.FileBasedTrustManagerCfg;
+import org.opends.server.admin.std.server.TrustManagerProviderCfg;
+import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
import org.opends.server.api.TrustManagerProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
@@ -68,8 +68,8 @@
* stored in a file located on the Directory Server filesystem.
*/
public class FileBasedTrustManagerProvider
- extends TrustManagerProvider<FileBasedTrustManagerCfg>
- implements ConfigurationChangeListener<FileBasedTrustManagerCfg>
+ extends TrustManagerProvider<FileBasedTrustManagerProviderCfg>
+ implements ConfigurationChangeListener<FileBasedTrustManagerProviderCfg>
{
/**
* The tracer object for the debug logger.
@@ -86,7 +86,7 @@
private char[] trustStorePIN;
// The handle to the configuration for this trust manager.
- private FileBasedTrustManagerCfg currentConfig;
+ private FileBasedTrustManagerProviderCfg currentConfig;
// The path to the trust store backing file.
private String trustStoreFile;
@@ -113,7 +113,7 @@
*/
@Override()
public void initializeTrustManagerProvider(
- FileBasedTrustManagerCfg configuration)
+ FileBasedTrustManagerProviderCfg configuration)
throws ConfigException, InitializationException
{
// Store the DN of the configuration entry and register to listen for any
@@ -346,10 +346,12 @@
* {@inheritDoc}
*/
@Override()
- public boolean isConfigurationAcceptable(TrustManagerCfg configuration,
- List<Message> unacceptableReasons)
+ public boolean isConfigurationAcceptable(
+ TrustManagerProviderCfg configuration,
+ List<Message> unacceptableReasons)
{
- FileBasedTrustManagerCfg config = (FileBasedTrustManagerCfg) configuration;
+ FileBasedTrustManagerProviderCfg config =
+ (FileBasedTrustManagerProviderCfg) configuration;
return isConfigurationChangeAcceptable(config, unacceptableReasons);
}
@@ -359,7 +361,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationChangeAcceptable(
- FileBasedTrustManagerCfg configuration,
+ FileBasedTrustManagerProviderCfg configuration,
List<Message> unacceptableReasons)
{
boolean configAcceptable = true;
@@ -509,7 +511,7 @@
* {@inheritDoc}
*/
public ConfigChangeResult applyConfigurationChange(
- FileBasedTrustManagerCfg configuration)
+ FileBasedTrustManagerProviderCfg configuration)
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
--
Gitblit v1.10.0