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

matthew_swift

26.21.2007 a052caad0008ede711b0c43d9955eccc3bb858ba

 opendj-sdk/opends/src/server/org/opends/server/extensions/BlindTrustManagerProvider.java

@@ -32,7 +32,7 @@
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;

import org.opends.server.admin.std.server.BlindTrustManagerCfg;
import org.opends.server.admin.std.server.BlindTrustManagerProviderCfg;
import org.opends.server.api.TrustManagerProvider;
import org.opends.server.config.ConfigException;
import org.opends.server.types.DirectoryException;
@@ -49,7 +49,7 @@
 * trustworthy.
 */
public class BlindTrustManagerProvider
       extends TrustManagerProvider<BlindTrustManagerCfg>
       extends TrustManagerProvider<BlindTrustManagerProviderCfg>
       implements X509TrustManager
{
  /**
@@ -68,7 +68,8 @@
   * {@inheritDoc}
   */
  @Override()
  public void initializeTrustManagerProvider(BlindTrustManagerCfg configuration)
  public void initializeTrustManagerProvider(
                  BlindTrustManagerProviderCfg configuration)
         throws ConfigException, InitializationException
  {
    // No implementation is required.