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/FileBasedKeyManagerProvider.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index 94901e4..a018a08 100644
--- a/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opends/src/server/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -42,7 +42,7 @@
import javax.net.ssl.KeyManagerFactory;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.FileBasedKeyManagerCfg;
+import org.opends.server.admin.std.server.FileBasedKeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
@@ -66,8 +66,8 @@
* file located on the Directory Server filesystem.
*/
public class FileBasedKeyManagerProvider
- extends KeyManagerProvider<FileBasedKeyManagerCfg>
- implements ConfigurationChangeListener<FileBasedKeyManagerCfg>
+ extends KeyManagerProvider<FileBasedKeyManagerProviderCfg>
+ implements ConfigurationChangeListener<FileBasedKeyManagerProviderCfg>
{
/**
* The tracer object for the debug logger.
@@ -83,7 +83,7 @@
private char[] keyStorePIN;
// The configuration for this key manager provider.
- private FileBasedKeyManagerCfg currentConfig;
+ private FileBasedKeyManagerProviderCfg currentConfig;
// The path to the key store backing file.
private String keyStoreFile;
@@ -110,7 +110,7 @@
*/
@Override
public void initializeKeyManagerProvider(
- FileBasedKeyManagerCfg configuration)
+ FileBasedKeyManagerProviderCfg configuration)
throws ConfigException, InitializationException {
// Store the DN of the configuration entry and register as a change
// listener.
@@ -314,8 +314,9 @@
* {@inheritDoc}
*/
@Override()
- public boolean isConfigurationAcceptable(FileBasedKeyManagerCfg configuration,
- List<Message> unacceptableReasons)
+ public boolean isConfigurationAcceptable(
+ FileBasedKeyManagerProviderCfg configuration,
+ List<Message> unacceptableReasons)
{
return isConfigurationChangeAcceptable(configuration, unacceptableReasons);
}
@@ -326,7 +327,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationChangeAcceptable(
- FileBasedKeyManagerCfg configuration,
+ FileBasedKeyManagerProviderCfg configuration,
List<Message> unacceptableReasons)
{
boolean configAcceptable = true;
@@ -483,7 +484,7 @@
* {@inheritDoc}
*/
public ConfigChangeResult applyConfigurationChange(
- FileBasedKeyManagerCfg configuration)
+ FileBasedKeyManagerProviderCfg configuration)
{
ResultCode resultCode = ResultCode.SUCCESS;
boolean adminActionRequired = false;
--
Gitblit v1.10.0