From 1f57e739e7bdad0adcd611d7a0d880fa6074cc20 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 13 Sep 2007 13:55:51 +0000
Subject: [PATCH] Rename OpendsCerticationException into OpendsCertificateException (naming coherent with java.security.cert.CertificateException)
---
opendj-sdk/opends/src/ads/org/opends/admin/ads/util/OpendsCertificateException.java | 6 +++---
opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 14 +++++++-------
opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java | 12 ++++++------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java
index 5b35b98..6e0ef96 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/ApplicationTrustManager.java
@@ -163,7 +163,7 @@
lastRefusedChain = chain;
lastRefusedAuthType = authType;
lastRefusedCause = Cause.NOT_TRUSTED;
- OpendsCertificationException e = new OpendsCertificationException(
+ OpendsCertificateException e = new OpendsCertificateException(
chain);
e.initCause(ce);
throw e;
@@ -180,7 +180,7 @@
lastRefusedChain = chain;
lastRefusedAuthType = authType;
lastRefusedCause = Cause.HOST_NAME_MISMATCH;
- OpendsCertificationException e = new OpendsCertificationException(
+ OpendsCertificateException e = new OpendsCertificateException(
chain);
e.initCause(ce);
throw e;
@@ -220,7 +220,7 @@
lastRefusedChain = chain;
lastRefusedAuthType = authType;
lastRefusedCause = Cause.NOT_TRUSTED;
- OpendsCertificationException e = new OpendsCertificationException(chain);
+ OpendsCertificateException e = new OpendsCertificateException(chain);
e.initCause(ce);
throw e;
}
@@ -236,7 +236,7 @@
lastRefusedChain = chain;
lastRefusedAuthType = authType;
lastRefusedCause = Cause.HOST_NAME_MISMATCH;
- OpendsCertificationException e = new OpendsCertificationException(
+ OpendsCertificateException e = new OpendsCertificateException(
chain);
e.initCause(ce);
throw e;
@@ -345,7 +345,7 @@
}
if (!found)
{
- throw new OpendsCertificationException(
+ throw new OpendsCertificateException(
"Certificate not in list of accepted certificates", chain);
}
}
@@ -379,7 +379,7 @@
if (!matches)
{
- throw new OpendsCertificationException(
+ throw new OpendsCertificateException(
"Hostname mismatch between host name " + host
+ " and subject DN: " + chain[0].getSubjectX500Principal(),
chain);
diff --git a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/OpendsCertificationException.java b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/OpendsCertificateException.java
similarity index 92%
rename from opendj-sdk/opends/src/ads/org/opends/admin/ads/util/OpendsCertificationException.java
rename to opendj-sdk/opends/src/ads/org/opends/admin/ads/util/OpendsCertificateException.java
index 11566d8..9f4d4c7 100644
--- a/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/OpendsCertificationException.java
+++ b/opendj-sdk/opends/src/ads/org/opends/admin/ads/util/OpendsCertificateException.java
@@ -38,7 +38,7 @@
* this exception is thrown. This allows to get the certificate chain
* which is unknown.
*/
-public class OpendsCertificationException extends CertificateException
+public class OpendsCertificateException extends CertificateException
{
/**
@@ -62,7 +62,7 @@
* @param chain the certificate chain which is unknown and has caused
* the SSL handcheck failure.
*/
- public OpendsCertificationException(X509Certificate[] chain)
+ public OpendsCertificateException(X509Certificate[] chain)
{
super();
this.chain = chain;
@@ -76,7 +76,7 @@
* @param chain the certificate chain which is unknown and has caused
* the SSL handcheck failure.
*/
- public OpendsCertificationException(String msg, X509Certificate[] chain)
+ public OpendsCertificateException(String msg, X509Certificate[] chain)
{
super(msg);
this.chain = chain;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 624bf65..9832afa 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -27,7 +27,7 @@
package org.opends.server.tools.dsconfig;
import org.opends.admin.ads.util.ConnectionUtils;
-import org.opends.admin.ads.util.OpendsCertificationException;
+import org.opends.admin.ads.util.OpendsCertificateException;
import static org.opends.messages.DSConfigMessages.*;
import org.opends.messages.Message;
@@ -118,10 +118,10 @@
{
if ((e.getRootCause() != null)
&& (e.getRootCause().getCause()
- instanceof OpendsCertificationException))
+ instanceof OpendsCertificateException))
{
- OpendsCertificationException oce =
- (OpendsCertificationException) e.getRootCause().getCause();
+ OpendsCertificateException oce =
+ (OpendsCertificateException) e.getRootCause().getCause();
if (ci.checkServerCertificate(oce.getChain()))
{
// If the certificate is trusted, update the trust manager.
@@ -166,10 +166,10 @@
{
if ((e.getRootCause() != null)
&& (e.getRootCause().getCause()
- instanceof OpendsCertificationException))
+ instanceof OpendsCertificateException))
{
- OpendsCertificationException oce =
- (OpendsCertificationException) e.getRootCause().getCause();
+ OpendsCertificateException oce =
+ (OpendsCertificateException) e.getRootCause().getCause();
if (ci.checkServerCertificate(oce.getChain()))
{
// If the certificate is trusted, update the trust manager.
--
Gitblit v1.10.0