Renamed constants in ISigningUnit.

The constants in ISigningUnit have been renamed to be more consistent with OCSP's SigningUnit. https://pagure.io/dogtagpki/issue/2901 Change-Id: I0b9137c80ad2be0a6c7dd063382629c85961a7f3
dogtagpki · Jan 17, 2018 · 982e4da · 982e4da
1 parent ce8872c
commit 982e4da
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/base/ca/src/com/netscape/ca/SigningUnit.java b/base/ca/src/com/netscape/ca/SigningUnit.java
@@ -36,6 +36,7 @@
 
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
+import com.netscape.certsrv.base.EPropertyNotFound;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.ISubsystem;
 import com.netscape.certsrv.ca.CAMissingCertException;
@@ -111,7 +112,7 @@ public PrivateKey getPrivateKey() {
     }
 
     public void updateConfig(String nickname, String tokenname) {
-        mConfig.putString(PROP_CERT_NICKNAME, nickname);
+        mConfig.putString(PROP_CA_CERT_NICKNAME, nickname);
         mConfig.putString(PROP_TOKEN_NAME, tokenname);
     }
 
@@ -139,9 +140,9 @@ public void init(ISubsystem owner, IConfigStore config, String nickname)
 
             if (nickname == null) {
                 try {
-                    mNickname = mConfig.getString(PROP_RENAMED_CERT_NICKNAME);
-                } catch (EBaseException e) {
                     mNickname = mConfig.getString(PROP_CERT_NICKNAME);
+                } catch (EPropertyNotFound e) {
+                    mNickname = mConfig.getString(PROP_CA_CERT_NICKNAME);
                 }
             } else {
                 mNickname = nickname;

diff --git a/base/common/src/com/netscape/certsrv/security/ISigningUnit.java b/base/common/src/com/netscape/certsrv/security/ISigningUnit.java
@@ -20,13 +20,13 @@
 import java.security.PrivateKey;
 import java.security.PublicKey;
 
-import netscape.security.x509.X509CertImpl;
-
 import org.mozilla.jss.crypto.SignatureAlgorithm;
 import org.mozilla.jss.crypto.X509Certificate;
 
 import com.netscape.certsrv.base.EBaseException;
 
+import netscape.security.x509.X509CertImpl;
+
 /**
  * A class represents the signing unit which is
  * capable of signing data.
@@ -36,10 +36,18 @@
 public interface ISigningUnit {
 
     public static final String PROP_DEFAULT_SIGNALG = "defaultSigningAlgorithm";
-    public static final String PROP_CERT_NICKNAME = "cacertnickname";
-    // This signing unit is being used in OCSP and CRL also. So
-    // it is better to have a more generic name
-    public static final String PROP_RENAMED_CERT_NICKNAME = "certnickname";
+
+    /**
+     * @deprecated The cacertnickname has been replaced with certnickname.
+     *
+     * TODO: Remove cacertnickname property from existing instances with
+     * an upgrade script.
+     */
+    @Deprecated
+    public static final String PROP_CA_CERT_NICKNAME = "cacertnickname";
+    public static final String PROP_CERT_NICKNAME = "certnickname";
+
+
     public static final String PROP_TOKEN_NAME = "tokenname";
     public static final String PROP_NEW_NICKNAME = "newNickname";