This commit is a step toward getting OpenDS internationalized. There are st...

kenneth_suter

15.34.2007 80c58327faaa4873369f6bb949e62792c2f708e0

 opends/src/server/org/opends/server/util/ExpirationCheckTrustManager.java

@@ -35,13 +35,11 @@
import java.util.Date;
import javax.net.ssl.X509TrustManager;

import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;


import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.UtilityMessages.*;

import static org.opends.messages.UtilityMessages.*;
import org.opends.messages.Message;


/**
@@ -95,21 +93,17 @@
      }
      catch (CertificateExpiredException cee)
      {
        int msgID = MSGID_EXPCHECK_TRUSTMGR_CLIENT_CERT_EXPIRED;
        String message = getMessage(msgID, c.getSubjectDN().getName(),
                                    String.valueOf(c.getNotAfter()));
        logError(ErrorLogCategory.CONNECTION_HANDLING,
                 ErrorLogSeverity.SEVERE_WARNING, message, msgID);
        Message message = ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_EXPIRED.get(
            c.getSubjectDN().getName(), String.valueOf(c.getNotAfter()));
        logError(message);

        throw cee;
      }
      catch (CertificateNotYetValidException cnyve)
      {
        int msgID = MSGID_EXPCHECK_TRUSTMGR_CLIENT_CERT_NOT_YET_VALID;
        String message = getMessage(msgID, c.getSubjectDN().getName(),
                                    String.valueOf(c.getNotBefore()));
        logError(ErrorLogCategory.CONNECTION_HANDLING,
                 ErrorLogSeverity.SEVERE_WARNING, message, msgID);
        Message message = ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_NOT_YET_VALID.get(
            c.getSubjectDN().getName(), String.valueOf(c.getNotBefore()));
        logError(message);

        throw cnyve;
      }
@@ -144,21 +138,17 @@
      }
      catch (CertificateExpiredException cee)
      {
        int msgID = MSGID_EXPCHECK_TRUSTMGR_SERVER_CERT_EXPIRED;
        String message = getMessage(msgID, c.getSubjectDN().getName(),
                                    String.valueOf(c.getNotAfter()));
        logError(ErrorLogCategory.CONNECTION_HANDLING,
                 ErrorLogSeverity.SEVERE_WARNING, message, msgID);
        Message message = ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_EXPIRED.get(
            c.getSubjectDN().getName(), String.valueOf(c.getNotAfter()));
        logError(message);

        throw cee;
      }
      catch (CertificateNotYetValidException cnyve)
      {
        int msgID = MSGID_EXPCHECK_TRUSTMGR_SERVER_CERT_NOT_YET_VALID;
        String message = getMessage(msgID, c.getSubjectDN().getName(),
                                    String.valueOf(c.getNotBefore()));
        logError(ErrorLogCategory.CONNECTION_HANDLING,
                 ErrorLogSeverity.SEVERE_WARNING, message, msgID);
        Message message = ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_NOT_YET_VALID.get(
            c.getSubjectDN().getName(), String.valueOf(c.getNotBefore()));
        logError(message);

        throw cnyve;
      }