summaryrefslogtreecommitdiffstats
path: root/pki/base/common/src/com/netscape/certsrv/common
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv/common')
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java36
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/Constants.java119
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/DestDef.java3
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java17
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java36
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/OpDef.java3
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java7
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java23
-rw-r--r--pki/base/common/src/com/netscape/certsrv/common/TaskId.java9
9 files changed, 111 insertions, 142 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java b/pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
index 9f892cd25..2ea7b7469 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/ConfigConstants.java
@@ -17,12 +17,11 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
/**
- * This interface contains constants that are used
- * in the protocol between the configuration daemon
+ * This interface contains constants that are used
+ * in the protocol between the configuration daemon
* and UI configuration wizard.
- *
+ *
* @version $Revision$, $Date$
*/
public interface ConfigConstants {
@@ -30,8 +29,8 @@ public interface ConfigConstants {
public static final String TRUE = "true";
public static final String FALSE = "false";
public static final String OPTYPE = "opType";
- public static final String TASKID = "taskID";
-
+ public static final String TASKID = "taskID";
+
// Stages
public static final String STAGES = "stages";
public static final String STAGE_INTERNAL_DB = "stageInternalDB";
@@ -135,7 +134,7 @@ public interface ConfigConstants {
public static final String PR_EE_SECURE_PORT = "eeGateway.https.port";
public static final String PR_AGENT_PORT = "agentGateway.https.port";
public static final String PR_RADM_PORT = "radm.https.port";
- public static final String PR_RADM_PORT_SETUP="radm.port";
+ public static final String PR_RADM_PORT_SETUP = "radm.port";
public static final String PR_EE_PORT_ENABLE = "eeGateway.http.enable";
public static final String PR_EE_PORTS_ENABLE = "eePortsEnable";
@@ -173,27 +172,27 @@ public interface ConfigConstants {
public static final String PR_ADD_LDIF_PATH = "addLdifPath";
public static final String PR_MOD_LDIF_PATH = "modLdifPath";
public static final String PR_SIGNING_KEY_MIGRATION_TOKEN =
- "signingKeyMigrationToken";
+ "signingKeyMigrationToken";
public static final String PR_SSL_KEY_MIGRATION_TOKEN =
- "sslKeyMigrationToken";
+ "sslKeyMigrationToken";
public static final String PR_SIGNING_KEY_MIGRATION_TOKEN_PASSWD =
- "signingKeyMigrationTokenPasswd";
+ "signingKeyMigrationTokenPasswd";
public static final String PR_SIGNING_KEY_MIGRATION_TOKEN_SOPPASSWD =
- "signingKeyMigrationTokenSOPPasswd";
+ "signingKeyMigrationTokenSOPPasswd";
public static final String PR_SSL_KEY_MIGRATION_TOKEN_PASSWD =
- "sslKeyMigrationTokenPasswd";
+ "sslKeyMigrationTokenPasswd";
public static final String PR_SSL_KEY_MIGRATION_TOKEN_SOPPASSWD =
- "sslKeyMigrationTokenSOPPasswd";
+ "sslKeyMigrationTokenSOPPasswd";
public static final String PR_NUM_MIGRATION_WARNINGS =
- "numMigrationWarnings";
+ "numMigrationWarnings";
public static final String PR_MIGRATION_WARNING = "migrationWarning";
public static final String PR_CA_KEY_TYPE = "caKeyType";
public static final String PR_LDAP_PASSWORD = "ldapPassword";
public static final String PR_MIGRATION_PASSWORD = "migrationPassword";
// Key and Cert
- public static final String PR_HARDWARE_SPLIT = "hardwareSplit";
- public static final String PR_TOKEN_LIST = "tokenList";
+ public static final String PR_HARDWARE_SPLIT = "hardwareSplit";
+ public static final String PR_TOKEN_LIST = "tokenList";
public static final String PR_TOKEN_NAME = "tokenName";
public static final String PR_SUBJECT_NAME = "subjectName";
public static final String PR_CA_SUBJECT_NAME = "caSubjectName";
@@ -293,8 +292,8 @@ public interface ConfigConstants {
// CA serial number
public static final String PR_CA_SERIAL_NUMBER = "caSerialNumber";
public static final String PR_CA_ENDSERIAL_NUMBER = "caEndSerialNumber";
-
- // KRA number
+
+ // KRA number
public static final String PR_REQUEST_NUMBER = "requestNumber";
public static final String PR_ENDREQUEST_NUMBER = "endRequestNumber";
public static final String PR_SERIAL_REQUEST_NUMBER = "serialRequestNumber";
@@ -331,4 +330,3 @@ public interface ConfigConstants {
public static final String PR_AGREEMENT_NAME_2 = "agreementName2";
public static final String PR_REPLICATION_MANAGER_PASSWD_2 = "replicationManagerPwd2";
}
-
diff --git a/pki/base/common/src/com/netscape/certsrv/common/Constants.java b/pki/base/common/src/com/netscape/certsrv/common/Constants.java
index c85034918..be9d33b4c 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/Constants.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/Constants.java
@@ -17,11 +17,10 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
/**
- * This interface contains constants that are shared
+ * This interface contains constants that are shared
* by certificate server and its client SDK.
- *
+ *
* @version $Revision$, $Date$
*/
public interface Constants {
@@ -48,24 +47,24 @@ public interface Constants {
//STATIC UI TYPE
public final static String TYPE_PASSWORD = "password";
-
+
/**********************************************************
* PROPERTY NAME LISTED BELOW
**********************************************************/
-
+
/*========================================================
* General
- *========================================================*/
+ *========================================================*/
public final static String PR_PORT = "port";
public final static String PR_SSLPORT = "sslPort";
-
+
/*========================================================
* Tasks
*========================================================*/
public final static String PR_SERVER_START = "start";
public final static String PR_SERVER_STOP = "stop";
public final static String PR_SERVER_RESTART = "restart";
-
+
/*========================================================
* Networks
*========================================================*/
@@ -79,15 +78,15 @@ public interface Constants {
public final static String PR_GATEWAY_S_BACKLOG = "gateway.https.backlog";
public final static String PR_GATEWAY_BACKLOG = "gateway.http.backlog";
public final static String PR_GATEWAY_PORT_ENABLED =
- "gateway.http.enable";
+ "gateway.http.enable";
public final static String PR_MASTER_AGENT_PORT = "master.ca.agent.port";
public final static String PR_MASTER_AGENT_HOST = "master.ca.agent.host";
-
+
/*========================================================
* SMTP
*========================================================*/
public final static String PR_SERVER_NAME = "server";
-
+
/*========================================================
* SNMP
*========================================================*/
@@ -109,7 +108,7 @@ public interface Constants {
/*========================================================
* Users and Groups
*========================================================*/
-
+
//group properties
public final static String PR_GROUP_DESC = "desc";
public final static String PR_GROUP_USER = "user";
@@ -149,7 +148,7 @@ public interface Constants {
*========================================================*/
public final static String PR_NOTIFICATION_FORM_NAME = "emailTemplate";
public final static String PR_NOTIFICATION_SUBJECT =
- "emailSubject";
+ "emailSubject";
public final static String PR_NOTIFICATION_SENDER = "senderEmail";
public final static String PR_NOTIFICATION_RECEIVER = "recipientEmail";
@@ -194,7 +193,7 @@ public interface Constants {
/*========================================================
* LDAP Publishing
*========================================================*/
-
+
// publishing properties
public final static String PR_BASIC_AUTH = "BasicAuth";
public final static String PR_SSL_AUTH = "SslClientAuth";
@@ -253,7 +252,7 @@ public interface Constants {
public final static String PR_BASE_DN = "baseDN";
public final static String PR_DNCOMPS = "dnComps";
public final static String PR_FILTERCOMPS = "filterComps";
-
+
// ldap connection test
public final static String PR_CONN_INITED = "connInited";
public final static String PR_CONN_INIT_FAIL = "connInitFail";
@@ -323,10 +322,10 @@ public interface Constants {
public final static String PR_RENEWAL_ENABLED = "renewal.enabled";
public final static String PR_RENEWAL_VALIDITY = "renewal.validity";
public final static String PR_RENEWAL_EMAIL = "renewal.email";
- public final static String PR_RENEWAL_EXPIREDNOTIFIEDENABLED =
- "renewal.expired.notification.enabled";
- public final static String PR_RENEWAL_NUMNOTIFICATION =
- "renewal.numNotification";
+ public final static String PR_RENEWAL_EXPIREDNOTIFIEDENABLED =
+ "renewal.expired.notification.enabled";
+ public final static String PR_RENEWAL_NUMNOTIFICATION =
+ "renewal.numNotification";
public final static String PR_RENEWAL_INTERVAL = "renewal.interval";
public final static String PR_SERVLET_CLASS = "class";
public final static String PR_SERVLET_URI = "uri";
@@ -354,7 +353,7 @@ public interface Constants {
public final static String PR_ACL_CLASS = "class";
public final static String PR_ACL_DESC = "desc";
public final static String PR_ACL_RIGHTS = "rights";
-
+
/*========================================================
* Key Recovery
*========================================================*/
@@ -386,7 +385,7 @@ public interface Constants {
public final static String PR_RA_INSTANCE = "ra";
public final static String PR_KRA_INSTANCE = "kra";
public final static String PR_TKS_INSTANCE = "tks";
-
+
/*
* Certificate info
*/
@@ -467,7 +466,7 @@ public interface Constants {
/*========================================================
* Security
*========================================================*/
-
+
//functionality
public final static String PR_CERT_SERVER = "SERVER";
public final static String PR_CERT_ADMIN = "ADMIN";
@@ -477,7 +476,7 @@ public interface Constants {
public final static String PR_CERT_RA = "RA";
public final static String PR_CERT_POA = "POA";
public final static String PR_CERT_TRANS = "TRANS";
-
+
// key and certificate management
public final static String PR_OPERATION_TYPE = "operationtype";
public final static String PR_INSTALL_TYPE = "install";
@@ -485,9 +484,9 @@ public interface Constants {
//public final static String PR_CA_SIGNING_CERT = "cacert";
//public final static String PR_SERVER_CERT = "servercert";
public final static String PR_CLIENT_CERT = "clientcert";
- public final static String PR_FULL_INTERNAL_TOKEN_NAME="Internal Key Storage Token";
- public final static String PR_INTERNAL_TOKEN_NAME =
- "internal";
+ public final static String PR_FULL_INTERNAL_TOKEN_NAME = "Internal Key Storage Token";
+ public final static String PR_INTERNAL_TOKEN_NAME =
+ "internal";
public final static String PR_TOKEN_NAME = "tokenName";
public final static String PR_TOKEN_PASSWD = "tokenPwd";
public final static String PR_KEY_LENGTH = "keyLength";
@@ -503,15 +502,15 @@ public interface Constants {
public final static String PR_CSR = "csr";
//encryption
-
+
/* Cipher Version: domestic or export */
public final static String PR_CIPHER_VERSION = "cipherversion";
public final static String PR_CIPHER_VERSION_DOMESTIC = "cipherdomestic";
public final static String PR_CIPHER_VERSION_EXPORT = "cipherexport";
-
+
/* Cipher Fortezza: true, false */
public final static String PR_CIPHER_FORTEZZA = "cipherfortezza";
-
+
/* Token and Certificates */
public final static String PR_TOKEN_LIST = "tokenlist";
public final static String PR_TOKEN_PREFIX = "token_";
@@ -525,42 +524,24 @@ public interface Constants {
public final static String PR_ECTYPE = "ectype";
/* values for SSL cipher preferences */
- public final static String
- PR_SSL2_RC4_128_WITH_MD5 = "rc4";
- public final static String
- PR_SSL2_RC4_128_EXPORT40_WITH_MD5 = "rc4export";
- public final static String
- PR_SSL2_RC2_128_CBC_WITH_MD5 = "rc2";
- public final static String
- PR_SSL2_RC2_128_CBC_EXPORT40_WITH_MD5 = "rc2export";
- public final static String
- PR_SSL2_DES_64_CBC_WITH_MD5 = "des";
- public final static String
- PR_SSL2_DES_192_EDE3_CBC_WITH_MD5 = "desede3";
- public final static String
- PR_SSL3_RSA_WITH_NULL_MD5 = "rsa_null_md5";
- public final static String
- PR_SSL3_RSA_EXPORT_WITH_RC4_40_MD5 = "rsa_rc4_40_md5";
- public final static String
- PR_SSL3_RSA_WITH_RC4_128_MD5 = "rsa_rc4_128_md5";
- public final static String
- PR_SSL3_RSA_EXPORT_WITH_RC2_CBC_40_MD5 = "rsa_rc2_40_md5";
- public final static String
- PR_SSL3_RSA_WITH_DES_CBC_SHA = "rsa_des_sha";
- public final static String
- PR_SSL3_RSA_WITH_3DES_EDE_CBC_SHA = "rsa_3des_sha";
- public final static String
- PR_SSL3_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA = "fortezza";
- public final static String
- PR_SSL3_FORTEZZA_DMS_WITH_RC4_128_SHA = "fortezza_rc4_128_sha";
- public final static String
- PR_SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA = "rsa_fips_3des_sha";
- public final static String
- PR_SSL_RSA_FIPS_WITH_DES_CBC_SHA = "rsa_fips_des_sha";
- public final static String
- PR_TLS_RSA_EXPORT1024_WITH_RC4_56_SHA = "tls_rsa_rc4_56_sha";
- public final static String
- PR_TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA = "tls_rsa_des_sha";
+ public final static String PR_SSL2_RC4_128_WITH_MD5 = "rc4";
+ public final static String PR_SSL2_RC4_128_EXPORT40_WITH_MD5 = "rc4export";
+ public final static String PR_SSL2_RC2_128_CBC_WITH_MD5 = "rc2";
+ public final static String PR_SSL2_RC2_128_CBC_EXPORT40_WITH_MD5 = "rc2export";
+ public final static String PR_SSL2_DES_64_CBC_WITH_MD5 = "des";
+ public final static String PR_SSL2_DES_192_EDE3_CBC_WITH_MD5 = "desede3";
+ public final static String PR_SSL3_RSA_WITH_NULL_MD5 = "rsa_null_md5";
+ public final static String PR_SSL3_RSA_EXPORT_WITH_RC4_40_MD5 = "rsa_rc4_40_md5";
+ public final static String PR_SSL3_RSA_WITH_RC4_128_MD5 = "rsa_rc4_128_md5";
+ public final static String PR_SSL3_RSA_EXPORT_WITH_RC2_CBC_40_MD5 = "rsa_rc2_40_md5";
+ public final static String PR_SSL3_RSA_WITH_DES_CBC_SHA = "rsa_des_sha";
+ public final static String PR_SSL3_RSA_WITH_3DES_EDE_CBC_SHA = "rsa_3des_sha";
+ public final static String PR_SSL3_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA = "fortezza";
+ public final static String PR_SSL3_FORTEZZA_DMS_WITH_RC4_128_SHA = "fortezza_rc4_128_sha";
+ public final static String PR_SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA = "rsa_fips_3des_sha";
+ public final static String PR_SSL_RSA_FIPS_WITH_DES_CBC_SHA = "rsa_fips_des_sha";
+ public final static String PR_TLS_RSA_EXPORT1024_WITH_RC4_56_SHA = "tls_rsa_rc4_56_sha";
+ public final static String PR_TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA = "tls_rsa_des_sha";
/*========================================================
* Watchdog and Server State Messages
@@ -599,9 +580,9 @@ public interface Constants {
public final static String PT_DN = "dn";
public final static String PV_SYSTEM_ADMINISTRATORS =
- "SystemAdministrators";
+ "SystemAdministrators";
public final static String PV_CERTIFICATE_ADMINISTRATORS =
- "CertificateAdministrators";
+ "CertificateAdministrators";
public final static String OP_AUTHENTICATE = "authenticate";
public final static String OP_RESTART = "restart";
@@ -636,9 +617,9 @@ public interface Constants {
// certificate authority operations
public final static String PT_PUBLISH_DN = "ldappublish.ldap.admin-dn";
public final static String PT_PUBLISH_PWD =
- "ldappublish.ldap.admin-password";
+ "ldappublish.ldap.admin-password";
public final static String PT_PUBLISH_FREQ =
- "crl.crl0.autoUpdateInterval";
+ "crl.crl0.autoUpdateInterval";
public final static String PT_SERIALNO = "serialno";
public final static String PT_NAMES = "names";
public final static String PT_CERTIFICATES = "certificates";
diff --git a/pki/base/common/src/com/netscape/certsrv/common/DestDef.java b/pki/base/common/src/com/netscape/certsrv/common/DestDef.java
index 1d3eaff14..273e6af05 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/DestDef.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/DestDef.java
@@ -17,12 +17,11 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
/**
* This interface defines all the operation destination
* used in the administration protocol between the
* console and the server.
- *
+ *
* @version $Revision$, $Date$
*/
public interface DestDef {
diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java b/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java
index 44d55e32e..ed1d06149 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java
@@ -17,13 +17,10 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
-
-
/**
* A class represents a name value pair. A name value
* pair consists of a name and a value.
- *
+ *
* @version $Revision$, $Date$
*/
public class NameValuePair {
@@ -33,7 +30,7 @@ public class NameValuePair {
/**
* Constructs value pair object.
- *
+ *
* @param name name
* @param value value
*/
@@ -44,7 +41,7 @@ public class NameValuePair {
/**
* Retrieves the name.
- *
+ *
* @return name
*/
public String getName() {
@@ -53,19 +50,19 @@ public class NameValuePair {
/**
* Retrieves the value.
- *
+ *
* @return value
*/
public String getValue() {
return mValue;
}
-
+
/**
* Sets the value
- *
+ *
* @param value value
*/
public void setValue(String value) {
mValue = value;
}
-}
+}
diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java b/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
index 651de7820..61d3cad62 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java
@@ -17,17 +17,15 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.StringTokenizer;
import java.util.Vector;
-
/**
- * A class represents an ordered list of name
+ * A class represents an ordered list of name
* value pairs.
- *
+ *
* @version $Revision$, $Date$
*/
public class NameValuePairs {
@@ -40,7 +38,7 @@ public class NameValuePairs {
/**
* Constructs name value pairs.
- */
+ */
public NameValuePairs() {
}
@@ -48,7 +46,7 @@ public class NameValuePairs {
* Adds a name value pair into this set.
* if the name already exist, the value will
* be replaced.
- *
+ *
* @param name name
* @param value value
*/
@@ -66,7 +64,7 @@ public class NameValuePairs {
/**
* Retrieves name value pair from this set.
- *
+ *
* @param name name
* @return name value pair
*/
@@ -76,7 +74,7 @@ public class NameValuePairs {
/**
* Returns number of pairs in this set.
- *
+ *
* @return size
*/
public int size() {
@@ -85,7 +83,7 @@ public class NameValuePairs {
/**
* Retrieves name value pairs in specific position.
- *
+ *
* @param pos position of the value
* @return name value pair
*/
@@ -104,7 +102,7 @@ public class NameValuePairs {
/**
* Retrieves value of the name value pairs that matches
* the given name.
- *
+ *
* @param name name
* @return value
*/
@@ -119,14 +117,14 @@ public class NameValuePairs {
/**
* Retrieves a list of names.
- *
+ *
* @return a list of names
*/
public Enumeration<String> getNames() {
Vector<String> v = new Vector<String>();
- int size = mPairs.size();
+ int size = mPairs.size();
- for (int i = 0; i < size; i++) {
+ for (int i = 0; i < size; i++) {
NameValuePair p = (NameValuePair) mPairs.elementAt(i);
v.addElement(p.getName());
@@ -134,11 +132,11 @@ public class NameValuePairs {
//System.out.println("getNames: "+v.size());
return v.elements();
}
-
+
/**
* Show the content of this name value container as
* string representation.
- *
+ *
* @return string representation
*/
public String toString() {
@@ -155,7 +153,7 @@ public class NameValuePairs {
/**
* Parses a string into name value pairs.
- *
+ *
* @param s string
* @param nvp name value pairs
* @return true if successful
@@ -174,16 +172,16 @@ public class NameValuePairs {
String v = t.substring(i + 1);
nvp.add(n, v);
- }
+ }
return true;
}
/**
* Returns a list of name value pair object.
- *
+ *
* @return name value objects
*/
public Enumeration<NameValuePair> elements() {
return mPairs.elements();
}
-}
+}
diff --git a/pki/base/common/src/com/netscape/certsrv/common/OpDef.java b/pki/base/common/src/com/netscape/certsrv/common/OpDef.java
index 9cfcab4a2..22a974e12 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/OpDef.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/OpDef.java
@@ -17,12 +17,11 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
/**
* This interface defines all the administration operations
* used in the administration protocol between the console
* and the server.
- *
+ *
* @version $Revision$, $Date$
*/
public interface OpDef {
diff --git a/pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java b/pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java
index 11a58c5d2..833847d05 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/PrefixDef.java
@@ -17,12 +17,11 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
/**
* This interface defines all the prefix tags
* used in the administration protocol between
* the console and the server.
- *
+ *
* @version $Revision$, $Date$
*/
public interface PrefixDef {
@@ -34,8 +33,8 @@ public interface PrefixDef {
public final static String PX_SYS = "SYS_";
public final static String PX_DEF = "DEF_";
public final static String PX_PP = "CERT_PP";
-
+
//log content
public final static String PX_LOG = "log";
-
+
}
diff --git a/pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java b/pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java
index 0be3fdf0a..f29067f51 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/ScopeDef.java
@@ -17,12 +17,11 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
/**
* This interface defines all the operation scope
* used in the administration protocol between the
* console and the server.
- *
+ *
* @version $Revision$, $Date$
*/
public interface ScopeDef {
@@ -31,7 +30,7 @@ public interface ScopeDef {
public final static String SC_GROUPS = "groups";
public final static String SC_USERS = "users";
public final static String SC_USER_CERTS = "certs";
-
+
public final static String SC_SNMP = "snmp";
public final static String SC_SMTP = "smtp";
public final static String SC_SUBSYSTEM = "subsystem";
@@ -39,12 +38,12 @@ public interface ScopeDef {
public final static String SC_GATEWAY = "gateway";
public final static String SC_ADMIN = "admin";
public final static String SC_NETWORK = "network";
-
+
// profile
public final static String SC_PROFILE_IMPLS = "profile";
public final static String SC_PROFILE_RULES = "rules";
public final static String SC_PROFILE_DEFAULT_POLICY = "defaultPolicy";
- public final static String SC_PROFILE_CONSTRAINT_POLICY = "constraintPolicy";
+ public final static String SC_PROFILE_CONSTRAINT_POLICY = "constraintPolicy";
public final static String SC_PROFILE_POLICIES = "policies";
public final static String SC_PROFILE_POLICY_CONFIG = "config";
public final static String SC_PROFILE_INPUT = "profileInput";
@@ -83,7 +82,7 @@ public interface ScopeDef {
public final static String SC_LOG_CONTENT = "log_content";
public final static String SC_AUDITLOG_CONTENT = "transactionsLog_content";
public final static String SC_ERRORLOG_CONTENT = "errorLog_content";
- public final static String SC_SYSTEMLOG_CONTENT = "systemLog_content";
+ public final static String SC_SYSTEMLOG_CONTENT = "systemLog_content";
//LDAP publishing
public final static String SC_LDAP = "ldap";
@@ -109,9 +108,9 @@ public interface ScopeDef {
public final static String SC_RECOVERY = "recovery";
public final static String SC_AGENT_PWD = "agentPwd";
public final static String SC_MNSCHEME = "mnScheme";
-
+
//stat
- public final static String SC_STAT = "stat";
+ public final static String SC_STAT = "stat";
// RA
public final static String SC_GENERAL = "general";
@@ -119,10 +118,10 @@ public interface ScopeDef {
public final static String SC_PKIGW = "pkigw";
public final static String SC_SERVLET = "servlet";
public final static String SC_CONNECTOR = "connector";
-
+
//tasks
public final static String SC_TASKS = "tasks";
-
+
//authentication
public final static String SC_AUTH = "auths";
public final static String SC_AUTHTYPE = "authType";
@@ -139,7 +138,7 @@ public interface ScopeDef {
public final static String SC_NOTIFICATION_REQ_COMP = "notificationREQC";
public final static String SC_NOTIFICATION_REV_COMP = "notificationREVC";
public final static String SC_NOTIFICATION_RIQ = "notificationRIQ";
-
+
// acl
public final static String SC_ACL_IMPLS = "impl";
public final static String SC_ACL = "acls";
@@ -181,7 +180,7 @@ public interface ScopeDef {
public final static String SC_PLATFORM = "platform";
public final static String SC_GET_NICKNAMES = "getNicknames";
-
+
// Profile
public final static String SC_SUPPORTED_CONSTRAINTPOLICIES = "supportedConstraintPolicies";
diff --git a/pki/base/common/src/com/netscape/certsrv/common/TaskId.java b/pki/base/common/src/com/netscape/certsrv/common/TaskId.java
index 458822ff5..01a97b2a1 100644
--- a/pki/base/common/src/com/netscape/certsrv/common/TaskId.java
+++ b/pki/base/common/src/com/netscape/certsrv/common/TaskId.java
@@ -17,13 +17,12 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.certsrv.common;
-
/**
* This interface defines all the tasks used in
* the configuration protocol between the
* configuration wizard and the configuration
* daemon.
- *
+ *
* @version $Revision$, $Date$
*/
public interface TaskId {
@@ -66,7 +65,7 @@ public interface TaskId {
// get information about all cryptotokens
public final static String TASK_TOKEN_INFO = "tokenInfo";
-
+
// server get master or clone setting
public final static String TASK_MASTER_OR_CLONE = "SetMasterOrClone";
// single signon
@@ -100,10 +99,10 @@ public interface TaskId {
// set CA starting serial number
public final static String TASK_SET_CA_SERIAL = "setCASerial";
- // set CA starting serial number
+ // set CA starting serial number
public final static String TASK_SET_KRA_NUMBER = "setKRANumber";
- // check key length
+ // check key length
public final static String TASK_CHECK_KEYLENGTH = "checkKeyLength";
// check certificate extension