From 1b9f39db0f5450de6c3bb97cec681c342fff5944 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 08 Dec 2009 10:52:42 +0000
Subject: [PATCH] Move Message/MessageBuilder/LocalizableException/LocalizableIllegalArgumentException to public API since other public API elements reference them. Prefix Message/MessageBuilder with Localizable to emphasize that these classes are I18N related and not protocol messages. Keep MessageDescriptor private since users should not need access to it for now.
---
sdk/src/com/sun/opends/sdk/util/Platform.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/sdk/src/com/sun/opends/sdk/util/Platform.java b/sdk/src/com/sun/opends/sdk/util/Platform.java
index f3954bc..53bed41 100644
--- a/sdk/src/com/sun/opends/sdk/util/Platform.java
+++ b/sdk/src/com/sun/opends/sdk/util/Platform.java
@@ -38,6 +38,8 @@
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
+import org.opends.sdk.LocalizableMessage;
+
/**
* Provides a wrapper class that collects all of the JVM vendor
@@ -146,13 +148,13 @@
X500SignerCons =
X500SignerClass.getConstructor(Signature.class, X500NameClass);
} catch (ClassNotFoundException e) {
- Message msg = ERR_CERTMGR_CLASS_NOT_FOUND.get(e.getMessage());
+ LocalizableMessage msg = ERR_CERTMGR_CLASS_NOT_FOUND.get(e.getMessage());
throw new ExceptionInInitializerError(msg.toString());
} catch (SecurityException e) {
- Message msg = ERR_CERTMGR_SECURITY.get(e.getMessage());
+ LocalizableMessage msg = ERR_CERTMGR_SECURITY.get(e.getMessage());
throw new ExceptionInInitializerError(msg.toString());
} catch (NoSuchMethodException e) {
- Message msg = ERR_CERTMGR_NO_METHOD.get(e.getMessage());
+ LocalizableMessage msg = ERR_CERTMGR_NO_METHOD.get(e.getMessage());
throw new ExceptionInInitializerError(msg.toString());
}
}
@@ -181,7 +183,7 @@
String alias, char[] pwd, String dn) throws KeyStoreException {
if(!certReqAllowed) {
String vendor = System.getProperty("java.vendor");
- Message msg =
+ LocalizableMessage msg =
ERR_CERTMGR_CERT_SIGN_REQ_NOT_SUPPORTED.get(vendor);
throw new KeyStoreException(msg.toString());
}
@@ -194,17 +196,17 @@
PrintStream printStream =
new PrintStream(new FileOutputStream(csrFile.getAbsolutePath()));
if(keyStore == null) {
- Message msg = ERR_CERTMGR_KEYSTORE_NONEXISTANT.get();
+ LocalizableMessage msg = ERR_CERTMGR_KEYSTORE_NONEXISTANT.get();
throw new KeyStoreException(msg.toString());
}
PrivateKey privateKey = getPrivateKey(keyStore, alias, pwd);
if(privateKey == null) {
- Message msg = ERR_CERTMGR_PRIVATE_KEY.get(alias);
+ LocalizableMessage msg = ERR_CERTMGR_PRIVATE_KEY.get(alias);
throw new KeyStoreException(msg.toString());
}
Certificate cert = keyStore.getCertificate(alias);
if(cert == null) {
- Message msg = ERR_CERTMGR_ALIAS_NO_CERTIFICATE.get(alias);
+ LocalizableMessage msg = ERR_CERTMGR_ALIAS_NO_CERTIFICATE.get(alias);
throw new KeyStoreException(msg.toString());
}
Signature signature = Signature.getInstance(SIG_ALGORITHM);
@@ -221,7 +223,7 @@
print.invoke(request, printStream);
printStream.close();
} catch (Exception e) {
- Message msg = ERR_CERTMGR_CERT_REQUEST.get(alias,e.getMessage());
+ LocalizableMessage msg = ERR_CERTMGR_CERT_REQUEST.get(alias,e.getMessage());
throw new KeyStoreException(msg.toString());
}
return csrFile;
@@ -241,7 +243,7 @@
String alias, char[] pwd) throws KeyStoreException {
try {
if(ks == null) {
- Message msg = ERR_CERTMGR_KEYSTORE_NONEXISTANT.get();
+ LocalizableMessage msg = ERR_CERTMGR_KEYSTORE_NONEXISTANT.get();
throw new KeyStoreException(msg.toString());
}
ks.deleteEntry(alias);
@@ -249,7 +251,7 @@
ks.store(fs, pwd);
fs.close();
} catch (Exception e) {
- Message msg =
+ LocalizableMessage msg =
ERR_CERTMGR_DELETE_ALIAS.get(alias,e.getMessage());
throw new KeyStoreException(msg.toString());
}
@@ -282,14 +284,14 @@
}
//Do not support certificate replies.
if (ks.entryInstanceOf(alias ,KeyStore.PrivateKeyEntry.class)) {
- Message msg = ERR_CERTMGR_CERT_REPLIES_INVALID.get(alias);
+ LocalizableMessage msg = ERR_CERTMGR_CERT_REPLIES_INVALID.get(alias);
throw new KeyStoreException(msg.toString());
} else if(!ks.containsAlias(alias) ||
ks.entryInstanceOf(alias,
KeyStore.TrustedCertificateEntry.class))
trustedCert(alias, cf, ks, inStream);
else {
- Message msg = ERR_CERTMGR_ALIAS_INVALID.get(alias);
+ LocalizableMessage msg = ERR_CERTMGR_ALIAS_INVALID.get(alias);
throw new KeyStoreException(msg.toString());
}
FileOutputStream fileOutStream = new FileOutputStream(ksPath);
@@ -297,7 +299,7 @@
fileOutStream.close();
inStream.close();
} catch (Exception e) {
- Message msg =
+ LocalizableMessage msg =
ERR_CERTMGR_ADD_CERT.get(alias, e.getMessage());
throw new KeyStoreException(msg.toString());
}
@@ -330,7 +332,7 @@
ks = KeyStore.getInstance(ksType);
ks.load(null, pwd);
} else if(ks.containsAlias(alias)) {
- Message msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
+ LocalizableMessage msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
throw new KeyStoreException(msg.toString());
}
Object keypair =
@@ -355,7 +357,7 @@
ks.store(fileOutStream, pwd);
fileOutStream.close();
} catch (Exception e) {
- Message msg =
+ LocalizableMessage msg =
ERR_CERTMGR_GEN_SELF_SIGNED_CERT.get(alias, e.getMessage());
throw new KeyStoreException(msg.toString());
}
@@ -378,7 +380,7 @@
KeyStore ks, InputStream in) throws KeyStoreException {
try {
if (ks.containsAlias(alias) == true) {
- Message msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
+ LocalizableMessage msg = ERR_CERTMGR_ALIAS_ALREADY_EXISTS.get(alias);
throw new KeyStoreException(msg.toString());
}
X509Certificate cert = (X509Certificate) cf.generateCertificate(in);
@@ -386,7 +388,7 @@
cert.verify(cert.getPublicKey());
ks.setCertificateEntry(alias, cert);
} catch (Exception e) {
- Message msg =
+ LocalizableMessage msg =
ERR_CERTMGR_TRUSTED_CERT.get(alias,e.getMessage());
throw new KeyStoreException(msg.toString());
}
@@ -419,18 +421,18 @@
PrivateKey key = null;
try {
if(!ks.containsAlias(alias)) {
- Message msg = ERR_CERTMGR_ALIAS_DOES_NOT_EXIST.get(alias);
+ LocalizableMessage msg = ERR_CERTMGR_ALIAS_DOES_NOT_EXIST.get(alias);
throw new KeyStoreException(msg.toString());
}
if(!ks.entryInstanceOf(alias, KeyStore.PrivateKeyEntry.class) &&
!ks.entryInstanceOf(alias, KeyStore.SecretKeyEntry.class)) {
- Message msg =
+ LocalizableMessage msg =
ERR_CERTMGR_ALIAS_INVALID_ENTRY_TYPE.get(alias);
throw new KeyStoreException(msg.toString());
}
key = (PrivateKey)ks.getKey(alias, pwd);
} catch (Exception e) {
- Message msg =
+ LocalizableMessage msg =
ERR_CERTMGR_GET_KEY.get(alias,e.getMessage());
throw new KeyStoreException(msg.toString());
}
--
Gitblit v1.10.0