Refactored ConfigurationRequest.TOKEN_DEFAULT.

The ConfigurationRequest.TOKEN_DEFAULT has been replaced with
CryptoUtil.INTERNAL_TOKEN_FULL_NAME since they are identical.

https://fedorahosted.org/pki/ticket/2556

2 files changed, 12 insertions, 10 deletions

diff --git a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
index 69994fa38..0416853da 100644
--- a/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
+++ b/base/common/functional/src/com/netscape/cms/servlet/test/ConfigurationTest.java
@@ -62,6 +62,7 @@ import com.netscape.certsrv.system.ConfigurationRequest;
 import com.netscape.certsrv.system.ConfigurationResponse;
 import com.netscape.certsrv.system.SystemCertData;
 import com.netscape.certsrv.system.SystemConfigClient;
+import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.cmsutil.util.Utils;
 
 /**
@@ -251,7 +252,7 @@ public class ConfigurationTest {
         data.setSecurityDomainName("Testca2 security domain");
         data.setClone("false");
         data.setHierarchy("root");
-        data.setToken(ConfigurationRequest.TOKEN_DEFAULT);
+        data.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         data.setSubsystemName("test ca subsystem");
 
         data.setDsHost(host);
@@ -353,7 +354,7 @@ public class ConfigurationTest {
 
         data.setClone("false");
         data.setHierarchy("join");
-        data.setToken(ConfigurationRequest.TOKEN_DEFAULT);
+        data.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         data.setSubsystemName("test subca subsystem");
 
         data.setDsHost(host);
@@ -455,7 +456,7 @@ public class ConfigurationTest {
 
         data.setClone("false");
         data.setHierarchy("join");
-        data.setToken(ConfigurationRequest.TOKEN_DEFAULT);
+        data.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         data.setSubsystemName("test external ca subsystem");
 
         data.setDsHost(host);
@@ -557,7 +558,7 @@ public class ConfigurationTest {
 
         data.setClone("false");
         data.setHierarchy("join");
-        data.setToken(ConfigurationRequest.TOKEN_DEFAULT);
+        data.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         data.setSubsystemName("test external ca subsystem");
 
         data.setDsHost(host);
@@ -681,7 +682,7 @@ public class ConfigurationTest {
         data.setP12Password("redhat123");
 
         data.setHierarchy("root");
-        data.setToken(ConfigurationRequest.TOKEN_DEFAULT);
+        data.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         data.setSubsystemName("test clone ca subsystem");
 
         data.setDsHost(host);
@@ -724,7 +725,7 @@ public class ConfigurationTest {
         data.setSecurityDomainPassword("redhat123");
 
         data.setClone("false");
-        data.setToken(ConfigurationRequest.TOKEN_DEFAULT);
+        data.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         data.setSubsystemName("test kra subsystem");
 
         data.setDsHost(host);
@@ -827,7 +828,7 @@ public class ConfigurationTest {
         data.setSecurityDomainPassword("redhat123");
 
         data.setClone("false");
-        data.setToken(ConfigurationRequest.TOKEN_DEFAULT);
+        data.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         data.setSubsystemName("test ocsp subsystem");
 
         data.setDsHost(host);
@@ -919,7 +920,7 @@ public class ConfigurationTest {
         data.setSecurityDomainPassword("redhat123");
 
         data.setClone("false");
-        data.setToken(ConfigurationRequest.TOKEN_DEFAULT);
+        data.setToken(CryptoUtil.INTERNAL_TOKEN_FULL_NAME);
         data.setSubsystemName("test tks subsystem");
 
         data.setDsHost(host);
diff --git a/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java b/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
index cd9d3c8ba..2ac1f5a15 100644
--- a/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
+++ b/base/common/src/com/netscape/certsrv/system/ConfigurationRequest.java
@@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
+import com.netscape.cmsutil.crypto.CryptoUtil;
+
 /**
  * @author alee
  *
@@ -37,7 +39,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 public class ConfigurationRequest {
 
     //defaults
-    public static final String TOKEN_DEFAULT = "Internal Key Storage Token";
     public static final String NEW_DOMAIN = "newdomain";
     public static final String EXISTING_DOMAIN = "existingdomain";
     public static final String NEW_SUBDOMAIN = "newsubdomain";
@@ -45,7 +46,7 @@ public class ConfigurationRequest {
     @XmlElement
     protected String pin;
 
-    @XmlElement(defaultValue=TOKEN_DEFAULT)
+    @XmlElement(defaultValue=CryptoUtil.INTERNAL_TOKEN_FULL_NAME)
     protected String token;
 
     @XmlElement