Refactor monitor and exceptions

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / PkiUtils.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/PkiUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/PkiUtils.java
index 67f8f01c65ee8ca5a62bb236ef046e7a3f7bc57d..050b7d4d7b3cdcf123cee983452404e4f8b0c876 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/PkiUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/PkiUtils.java
@@ -15,7 +15,7 @@ import java.util.Date;
 
 import javax.security.auth.x500.X500Principal;
 
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
 import org.bouncycastle.cert.X509v3CertificateBuilder;
 import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
 import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
@@ -55,7 +55,7 @@ class PkiUtils {
                        keyStore.setKeyEntry(x500Principal.getName(), pair.getPrivate(), keyPassword, new Certificate[] { cert });
                        return cert;
                } catch (Exception e) {
-                       throw new ArgeoException("Cannot generate self-signed certificate", e);
+                       throw new CmsException("Cannot generate self-signed certificate", e);
                }
        }
 
@@ -71,7 +71,7 @@ class PkiUtils {
                        }
                        return store;
                } catch (Exception e) {
-                       throw new ArgeoException("Cannot load keystore " + keyStoreFile, e);
+                       throw new CmsException("Cannot load keystore " + keyStoreFile, e);
                }
        }
 
@@ -81,7 +81,7 @@ class PkiUtils {
                                keyStore.store(fis, keyStorePassword);
                        }
                } catch (Exception e) {
-                       throw new ArgeoException("Cannot save keystore " + keyStoreFile, e);
+                       throw new CmsException("Cannot save keystore " + keyStoreFile, e);
                }
        }