Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/src/server/org/opends/server/extensions/NullKeyManagerProvider.java

@@ -30,7 +30,7 @@

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.api.KeyManagerProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.types.DirectoryException;
@@ -45,7 +45,7 @@
 * other key manager provider has been defined in the server configuration.
 */
public class NullKeyManagerProvider
       extends KeyManagerProvider<KeyManagerCfg>{
       extends KeyManagerProvider<KeyManagerProviderCfg>{



@@ -66,7 +66,7 @@
   */
  @Override
  public void initializeKeyManagerProvider(
      KeyManagerCfg configuration) throws ConfigException,
      KeyManagerProviderCfg configuration) throws ConfigException,
      InitializationException {
    // No implementation is required.
  }