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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 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.