From 4d79a912a787333723b0a425bef8ed303e0176e9 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Tue, 10 Jul 2012 14:53:04 -0500
Subject: [PATCH] Removed duplicate com.netscape.certsrv.common.

The duplicate common source code in the console package have
been removed. Note that the binaries are still duplicated in
the pki-certsrv.jar and pki-console.jar.

Ticket #113
---
 .../netscape/certsrv/common/ConfigConstants.java   |  335 ---------
 .../src/com/netscape/certsrv/common/Constants.java |  733 --------------------
 .../src/com/netscape/certsrv/common/DestDef.java   |   57 --
 .../netscape/certsrv/common/NameValuePairs.java    |   82 ---
 .../src/com/netscape/certsrv/common/OpDef.java     |   39 -
 .../src/com/netscape/certsrv/common/PrefixDef.java |   41 --
 .../src/com/netscape/certsrv/common/ScopeDef.java  |  194 ------
 .../src/com/netscape/certsrv/common/TaskId.java    |  131 ----
 8 files changed, 0 insertions(+), 1612 deletions(-)
 delete mode 100644 base/console/src/com/netscape/certsrv/common/ConfigConstants.java
 delete mode 100644 base/console/src/com/netscape/certsrv/common/Constants.java
 delete mode 100644 base/console/src/com/netscape/certsrv/common/DestDef.java
 delete mode 100644 base/console/src/com/netscape/certsrv/common/NameValuePairs.java
 delete mode 100644 base/console/src/com/netscape/certsrv/common/OpDef.java
 delete mode 100644 base/console/src/com/netscape/certsrv/common/PrefixDef.java
 delete mode 100644 base/console/src/com/netscape/certsrv/common/ScopeDef.java
 delete mode 100644 base/console/src/com/netscape/certsrv/common/TaskId.java

diff --git a/base/console/src/com/netscape/certsrv/common/ConfigConstants.java b/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
deleted file mode 100644
index 4f3a0559137490368957d749b148218cc63fcdb5..0000000000000000000000000000000000000000
--- a/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
+++ /dev/null
@@ -1,335 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.common;
-
-/**
- * This interface contains constants that are used
- * in the protocol between the configuration daemon
- * and UI configuration wizard.
- *
- * @author Christine Ho
- * @version $Revision$, $Date$
- */
-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";
-
-    // Stages
-    public static final String STAGES = "stages";
-    public static final String STAGE_INTERNAL_DB = "stageInternalDB";
-    public static final String STAGE_CONNECT_DB = "stageConnectDB";
-    public static final String STAGE_SETUP_PORTS = "stageSetupPorts";
-    public static final String STAGE_SETUP_ADMINISTRATOR = "stageSetupAdmin";
-    public static final String STAGE_SETUP_SUBSYSTEMS = "stageSubsystems";
-    public static final String STAGE_DATA_MIGRATION = "stageDataMigration";
-    public static final String STAGE_CA_SELFSIGNED_CERT = "stageCASelfSignedCert";
-    public static final String STAGE_CA_CERT_REQUEST = "stageCACertRequest";
-    public static final String STAGE_CA_CERT_INSTALL = "stageCACertInstall";
-    public static final String STAGE_RA_LOCAL_CERT = "stageRALocalCert";
-    public static final String STAGE_RA_CERT_REQUEST = "stageRACertRequest";
-    public static final String STAGE_RA_CERT_INSTALL = "stageRACertInstall";
-    public static final String STAGE_KRA_LOCAL_CERT = "stageKRALocalCert";
-    public static final String STAGE_KRA_CERT_REQUEST = "stageKRACertRequest";
-    public static final String STAGE_KRA_CERT_INSTALL = "stageKRACertInstall";
-    public static final String STAGE_SSL_LOCAL_CERT = "stageSSLLocalCert";
-    public static final String STAGE_SSL_CERT_REQUEST = "stageSSLCertRequest";
-    public static final String STAGE_SSL_CERT_INSTALL = "stageSSLCertInstall";
-    public static final String STAGE_OCSP_LOCAL_CERT = "stageOCSPLocalCert";
-    public static final String STAGE_OCSP_CERT_REQUEST = "stageOCSPCertRequest";
-    public static final String STAGE_OCSP_CERT_INSTALL = "stageOCSPCertInstall";
-    public static final String STAGE_CA_CERTCHAIN_IMPORT = "stageCACertChain";
-    public static final String STAGE_RA_CERTCHAIN_IMPORT = "stageRACertChain";
-    public static final String STAGE_OCSP_CERTCHAIN_IMPORT = "stageOCSPCertChain";
-    public static final String STAGE_KRA_CERTCHAIN_IMPORT = "stageKRACertChain";
-    public static final String STAGE_SSL_CERTCHAIN_IMPORT = "stageSSLCertChain";
-    public static final String STAGE_OCSP_SERVICE_ADDED = "stageOCSPService";
-    public static final String STAGE_CONFIG_WEBSERVER = "stageConfigWebserver";
-    public static final String STAGE_REPLICATION_AGREEMENT = "stageReplicationAgreement";
-    public static final String PR_ENABLE_REPLICATION = "enableReplication";
-
-    public static final String CA_CERT_REQUEST = "CACertRequest";
-    public static final String RA_CERT_REQUEST = "RACertRequest";
-    public static final String OCSP_CERT_REQUEST = "OCSPCertRequest";
-    public static final String KRA_CERT_REQUEST = "KRACertRequest";
-    public static final String SSL_CERT_REQUEST = "SSLCertRequest";
-    public static final String STAGE_CA_REQ_SUCCESS = "stageCAReqSuccess";
-    public static final String STAGE_RA_REQ_SUCCESS = "stageRAReqSuccess";
-    public static final String STAGE_KRA_REQ_SUCCESS = "stageKRAReqSuccess";
-    public static final String STAGE_SSL_REQ_SUCCESS = "stageSSLReqSuccess";
-    public static final String STAGE_OCSP_REQ_SUCCESS = "stageOCSPReqSuccess";
-
-    public static final String STAGE_KRA_NM_SCHEME = "stageKRANMScheme";
-    public static final String STAGE_CACLONING = "stageCACloning";
-    public static final String STAGE_RACLONING = "stageRACloning";
-    public static final String STAGE_KRACLONING = "stageKRACloning";
-    public static final String STAGE_TKSCLONING = "stageTKSCloning";
-    public static final String STAGE_SSLCLONING = "stageSSLCloning";
-    public static final String STAGE_OCSPCLONING = "stageOCSPCloning";
-    public static final String STAGE_CLONEMASTER = "stageCloneMaster";
-    public static final String STAGE_UPDATE_DB_INFO = "stageUpdateDBInfo";
-
-    public static final String CA_CERT_REQUEST_BACK = "CACertRequestBack";
-    public static final String RA_CERT_REQUEST_BACK = "RACertRequestBack";
-    public static final String OCSP_CERT_REQUEST_BACK = "OCSPCertRequestBack";
-    public static final String KRA_CERT_REQUEST_BACK = "KRACertRequestBack";
-    public static final String SSL_CERT_REQUEST_BACK = "SSLCertRequestBack";
-
-    // Error messages
-    public static final String PR_ERROR_MESSAGE = "errorMsg";
-
-    // Certificate server instance
-    public static final String PR_CERT_INSTANCE_NAME = "instanceID";
-
-    // Admin server info
-    public static final String PR_HOST = "host";
-    public static final String PR_LDAP_DB_NAME = "ldapServerDB";
-    public static final String PR_SERVER_ROOT = "serverRoot";
-    public static final String PR_SIE_URL = "sieURL";
-    public static final String PR_ADMIN_PASSWD = "AdminUserPassword";
-    public static final String PR_ADMIN_UID = "adminUID";
-    public static final String PR_ADMIN_DOMAIN = "adminDomain";
-    public static final String PR_MACHINE_NAME = "machineName";
-
-    public static final String PR_CA_OCSP_SERVICE = "CAOCSPService";
-
-    // Daemon
-    public static final String PR_DAEMON_PORT = "daemonPort";
-    public static final String PR_DELETE_PASSWD_CONF = "deletePasswdConf";
-
-    // Internal Database
-    public static final String PR_DB_SCHEMA = "db.schema";
-    public static final String PR_DB_MODE = "db.mode";
-    public static final String PR_DB_PORT = "internaldb.ldapconn.port";
-    public static final String PR_DB_HOST = "internaldb.ldapconn.host";
-    public static final String PR_DB_BINDDN = "internaldb.ldapauth.bindDN";
-    public static final String PR_DB_BINDPWD = "internaldb.ldapauth.bindPWPrompt";
-    public static final String PR_DB_PWD = "db.password";
-    public static final String PR_DB_LOCAL = "db.local";
-    public static final String PR_DB_NAME = "db.instanceName";
-    public static final String PR_CLONEDDB_NAME = "db.cloned.instanceName";
-    public static final String PR_IS_DBCREATED = "db.isCreated";
-    public static final String PR_IS_CLONEDDB_CREATED = "db.cloned.isCreated";
-    public static final String PR_NEXT_AVAIL_PORT = "nextAvailPort";
-
-    // Network Ports
-    public static final String PR_ENABLE = "enabled";
-    public static final String PR_EE_PORT = "eeGateway.http.port";
-    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_EE_PORT_ENABLE = "eeGateway.http.enable";
-    public static final String PR_EE_PORTS_ENABLE = "eePortsEnable";
-
-    // Certificate server administrator
-    public static final String PR_CERT_ADMINNAME = "cert.admin.name";
-    public static final String PR_CERT_ADMINUID = "cert.admin.uid";
-    public static final String PR_CERT_ADMINPASSWD = "cert.admin.passwd";
-
-    // Subsystems
-    public static final String PR_SUBSYSTEMS = "subsystems";
-    public static final String PR_CA = "ca";
-    public static final String PR_RA = "ra";
-    public static final String PR_KRA = "kra";
-    public static final String PR_TKS = "tks";
-    public static final String PR_OCSP = "ocsp";
-    public static final String CA_HOST = "caHostname";
-    public static final String CA_PORT = "caPortnum";
-    public static final String CA_TIMEOUT = "caTimeout";
-    public static final String KRA_HOST = "kraHostname";
-    public static final String KRA_PORT = "kraPortnum";
-    public static final String KRA_TIMEOUT = "kraTimeout";
-    public static final String REMOTE_KRA_ENABLED = "remoteKRA";
-
-    // Clone Master (CLA)
-    public static final String CLA_HOST = "claHostname";
-    public static final String CLA_PORT = "claPortnum";
-    public static final String CLA_PORT_EE = "claPortnumEE";
-    public static final String CLA_TIMEOUT = "claTimeout";
-    public static final String CLONE_CA = "cloning";
-    public static final String PR_CLONE_SETTING_DONE = "cloneSettingDone";
-
-    // Data Migration
-    public static final String PR_ENABLE_MIGRATION = "migrationEnable";
-    public static final String PR_OUTPUT_PATH = "outputPath";
-    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";
-    public static final String PR_SSL_KEY_MIGRATION_TOKEN =
-            "sslKeyMigrationToken";
-    public static final String PR_SIGNING_KEY_MIGRATION_TOKEN_PASSWD =
-            "signingKeyMigrationTokenPasswd";
-    public static final String PR_SIGNING_KEY_MIGRATION_TOKEN_SOPPASSWD =
-            "signingKeyMigrationTokenSOPPasswd";
-    public static final String PR_SSL_KEY_MIGRATION_TOKEN_PASSWD =
-            "sslKeyMigrationTokenPasswd";
-    public static final String PR_SSL_KEY_MIGRATION_TOKEN_SOPPASSWD =
-            "sslKeyMigrationTokenSOPPasswd";
-    public static final String PR_NUM_MIGRATION_WARNINGS =
-            "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_TOKEN_NAME = "tokenName";
-    public static final String PR_SUBJECT_NAME = "subjectName";
-    public static final String PR_CA_SUBJECT_NAME = "caSubjectName";
-    public static final String PR_RA_SUBJECT_NAME = "raSubjectName";
-    public static final String PR_OCSP_SUBJECT_NAME = "ocspSubjectName";
-    public static final String PR_KRA_SUBJECT_NAME = "kraSubjectName";
-    public static final String PR_SSL_SUBJECT_NAME = "sslSubjectName";
-    public static final String PR_KEY_TYPE = "keyType";
-    public static final String PR_KEY_LENGTH = "keyLength";
-    public static final String PR_KEY_CURVENAME = "keyCurveName";
-    public static final String PR_CERT_REQUEST = "certReq";
-    public static final String PR_REQUEST_ID = "ReqID";
-    public static final String PR_REQUEST_FORMAT = "ReqFormat";
-    public static final String PR_REQUEST_PKCS10 = "PKCS10";
-    public static final String PR_REQUEST_CMC = "CMC";
-    public static final String PR_CERTIFICATE_TYPE = "certType";
-    public static final String PR_CACERT_LOCALCA = "ca_isLocalCA";
-    public static final String PR_RACERT_LOCALCA = "ra_isLocalCA";
-    public static final String PR_KRACERT_LOCALCA = "kra_isLocalCA";
-    public static final String PR_SSLCERT_LOCALCA = "ssl_isLocalCA";
-    public static final String PR_OCSPCERT_LOCALCA = "ocsp_isLocalCA";
-    public static final String PR_CERT_CONTENT_ORDER = "contentOrder";
-    public static final String PR_CERTIFICATE_EXTENSION = "certificateExtension";
-    public static final String CA_REQUEST_DISPLAYED = "caReqDisplayed";
-    public static final String RA_REQUEST_DISPLAYED = "raReqDisplayed";
-    public static final String OCSP_REQUEST_DISPLAYED = "ocspReqDisplayed";
-    public static final String KRA_REQUEST_DISPLAYED = "kraReqDisplayed";
-    public static final String SSL_REQUEST_DISPLAYED = "sslReqDisplayed";
-
-    // KRA Storage Key Generation
-    public static final String PR_KEY_LEN = "keyLength";
-    public static final String PR_KEY_ALG = "keyAlg";
-    public static final String PR_STORAGE_TOKEN_PWD = "storageTokenPwd";
-    public static final String PR_STORAGE_HARDWARE = "storageHardware";
-
-    // KRA Agents
-    public static final String PR_AGENT_N = "n";
-    public static final String PR_AGENT_M = "m";
-    public static final String PR_AGENT_UID = "uid";
-    public static final String PR_AGENT_PWD = "pwd";
-
-    // Token Info
-    public static final String PR_TOKEN_NAMES = "tokenNames";
-    public static final String PR_TOKEN_INITIALIZED = "tokenInitialized";
-    public static final String PR_TOKEN_LOGGED_IN = "tokenLoggedIn";
-    public static final String PR_TOKEN_PASSWD = "tokenPasswd";
-    public static final String PR_TOKEN_SOP = "sopPasswd";
-    public static final String PR_CLONE_SUBSYSTEM = "cloneSubsystem";
-    public static final String PR_CLONE_CA_TOKEN_NAME = "cloneCATokenName";
-    public static final String PR_CLONE_OCSP_TOKEN_NAME = "cloneOCSPTokenName";
-    public static final String PR_CLONE_RA_TOKEN_NAME = "cloneRATokenName";
-    public static final String PR_CLONE_KRA_TOKEN_NAME = "cloneKRATokenName";
-    public static final String PR_CLONE_STORAGE_TOKEN_NAME = "cloneStorageTokenName";
-    public static final String PR_CLONE_SSL_TOKEN_NAME = "cloneSSLTokenName";
-    public static final String PR_CLONE_CA_NICKNAME = "cloneCANickname";
-    public static final String PR_CLONE_OCSP_NICKNAME = "cloneOCSPNickname";
-    public static final String PR_CLONE_RA_NICKNAME = "cloneRANickname";
-    public static final String PR_CLONE_KRA_NICKNAME = "cloneKRANickname";
-    public static final String PR_CLONE_STORAGE_NICKNAME = "cloneStorageNickname";
-    public static final String PR_CLONE_SSL_NICKNAME = "cloneSSLNickname";
-    public static final String PR_TOKEN_LOGONLIST = "tokenLogonList";
-    public static final String PR_TOKEN_LOGON_PWDS = "tokenLogonPasswords";
-    public static final String PR_SUBSYSTEM = "subsystem";
-
-    // Single Signon
-    public static final String PR_SINGLE_SIGNON = "singleSignon";
-    public static final String PR_SINGLE_SIGNON_PASSWORD = "singleSignonPwd";
-    public static final String PR_SINGLE_SIGNON_PW_TAGS = "singleSignonPWTags";
-
-    public static final String PR_CERT_CHAIN = "certChain";
-
-    // Token Subsystem Info
-    public static final String PR_CA_TOKEN = "caToken";
-    public static final String PR_RA_TOKEN = "raToken";
-    public static final String PR_KRA_TOKEN = "kraToken";
-    public static final String PR_SSL_TOKEN = "sslToken";
-    //public static final String PR_SUBSYSTEMS = "subsystems";
-
-    // Key Length
-    public static final String PR_RSA_MIN_KEYLENGTH = "RSAMinKeyLength";
-    public static final String PR_CA_KEYTYPE = "ca_keyType";
-    public static final String PR_HASH_TYPE = "hashType";
-    public static final String PR_SIGNEDBY_TYPE = "signedBy";
-    public static final String PR_NOTAFTER = "notAfter";
-    public static final String PR_CA_O_COMPONENT = "caOComponent";
-    public static final String PR_CA_C_COMPONENT = "caCComponent";
-    public static final String PR_RA_O_COMPONENT = "raOComponent";
-    public static final String PR_RA_C_COMPONENT = "raCComponent";
-    public static final String PR_OCSP_O_COMPONENT = "ocspOComponent";
-    public static final String PR_OCSP_C_COMPONENT = "ocspCComponent";
-
-    // Subject DN
-    public static final String PR_OU_COMPONENT = "OU_Component";
-    public static final String PR_O_COMPONENT = "O_Component";
-    public static final String PR_L_COMPONENT = "L_Component";
-    public static final String PR_ST_COMPONENT = "ST_Component";
-    public static final String PR_C_COMPONENT = "C_Component";
-
-    // CA serial number
-    public static final String PR_CA_SERIAL_NUMBER = "caSerialNumber";
-    public static final String PR_CA_ENDSERIAL_NUMBER = "caEndSerialNumber";
-
-    // KRA serial 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";
-
-    // Cloning
-    public static final String PR_CLONING_INSTANCE = "cloningInstance";
-    public static final String PR_CLONE_CERTIFICATES = "clonedCertificates";
-
-    // Cert request
-    public static final String CA_EEPORT = "caEEPort";
-    public static final String CA_EETYPE = "caEEType";
-
-    // Certificate chain
-    public static final String NOT_IMPORT_CHAIN = "notImportChain";
-
-    public static final String OVERRIDE_VALIDITY = "overrideValidity";
-
-    // request status: should be consistent with RequestStatus.java
-    public static String BEGIN_STRING = "begin";
-    public static String PENDING_STRING = "pending";
-    public static String APPROVED_STRING = "approved";
-    public static String SVC_PENDING_STRING = "svc_pending";
-    public static String CANCELED_STRING = "canceled";
-    public static String REJECTED_STRING = "rejected";
-    public static String COMPLETE_STRING = "complete";
-
-    public static String PR_CMS_SEED = "cmsSeed";
-
-    public static String PR_WEB_SERVERROOT = "webServerRoot";
-    public static String PR_USER_ID = "webUserId";
-
-    public static final String PR_AGREEMENT_NAME_1 = "agreementName1";
-    public static final String PR_REPLICATION_MANAGER_PASSWD_1 = "replicationManagerPwd1";
-    public static final String PR_AGREEMENT_NAME_2 = "agreementName2";
-    public static final String PR_REPLICATION_MANAGER_PASSWD_2 = "replicationManagerPwd2";
-}
diff --git a/base/console/src/com/netscape/certsrv/common/Constants.java b/base/console/src/com/netscape/certsrv/common/Constants.java
deleted file mode 100644
index 880e146430f934d18e386d9646160789f1ba160e..0000000000000000000000000000000000000000
--- a/base/console/src/com/netscape/certsrv/common/Constants.java
+++ /dev/null
@@ -1,733 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.common;
-
-/**
- * This interface contains constants that are shared
- * by certificate server and its client SDK.
- *
- * @author Jack Pan-Chen
- * @author Christine Ho
- * @version $Revision$, $Date$
- */
-public interface Constants {
-
-    /*=======================================================
-     * MESSAGE FORMAT CONSTANTS
-     *=======================================================*/
-    public static final String PASSWORDTYPE = "PasswordField";
-    public static final String TEXTTYPE = "TextField";
-    public static final String CHECKBOXTYPE = "CheckBox";
-    public static final String COMBOTYPE = "ComboBox";
-    public final static String TRUE = "true";
-    public final static String FALSE = "false";
-    public final static String VIEW = "view";
-    public final static String EDIT = "edit";
-
-    public final static String OP_TYPE = "OP_TYPE";
-    public final static String OP_SCOPE = "OP_SCOPE";
-
-    //STATIC RESOURCE IDENTIFIERS
-    public final static String RS_ID = "RS_ID";
-    public final static String RS_ID_CONFIG = "RS_ID_CONFIG";
-    public final static String RS_ID_ORDER = "RS_ID_ORDER";
-
-    //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
-     *========================================================*/
-    public final static String PR_ADMIN_S_PORT = "admin.https.port";
-    public final static String PR_AGENT_S_PORT = "agent.https.port";
-    public final static String PR_GATEWAY_S_PORT = "gateway.https.port";
-    public final static String PR_GATEWAY_PORT = "gateway.http.port";
-    public final static String PR_DOC_ROOT = "docroot";
-    public final static String PR_ADMIN_S_BACKLOG = "admin.https.backlog";
-    public final static String PR_AGENT_S_BACKLOG = "agent.https.backlog";
-    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";
-    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
-     *========================================================*/
-    public final static String PR_SNMP_ENABLED = "on";
-    public final static String PR_SNMP_MASTER_HOST = "master.host";
-    public final static String PR_SNMP_MASTER_PORT = "master.port";
-    public final static String PR_SNMP_DESC = "desc";
-    public final static String PR_SNMP_ORGN = "orgn";
-    public final static String PR_SNMP_LOC = "loc";
-    public final static String PR_SNMP_CONTACT = "contact";
-
-    /*========================================================
-     * Self Tests
-     *========================================================*/
-    public final static String PR_RUN_SELFTESTS_ON_DEMAND = "run";
-    public final static String PR_RUN_SELFTESTS_ON_DEMAND_CLASS = "class";
-    public final static String PR_RUN_SELFTESTS_ON_DEMAND_CONTENT = "runContent";
-
-    /*========================================================
-     * Users and Groups
-     *========================================================*/
-
-    //group properties
-    public final static String PR_GROUP_DESC = "desc";
-    public final static String PR_GROUP_USER = "user";
-    public final static String PR_GROUP_GROUP = "group";
-
-    //user properties
-    public final static String PR_USER_FULLNAME = "fullname";
-    public final static String PR_USER_PASSWORD = "password";
-    public final static String PR_USER_EMAIL = "email";
-    public final static String PR_USER_PHONE = "phone";
-    public final static String PR_USER_STATE = "state";
-    public final static String PR_USER_CERT = "cert";
-    public final static String PR_USER_GROUP = "groups";
-    public final static String PR_MULTIROLES = "multiroles";
-
-    /*========================================================
-     * Authentication
-     *========================================================*/
-    public final static String PR_PING = "ping";
-    public final static String PR_AUTH_CLASS = "class";
-    public final static String PR_AUTH_IMPL_NAME = "implName";
-    public final static String PR_AUTH_HOST = "ldapconn.host";
-    public final static String PR_AUTH_PORT = "ldapconn.port";
-    public final static String PR_AUTH_BASEDN = "basedn";
-    public final static String PR_AUTH_ADMIN_DN = "ldapauth.bindDN";
-    public final static String PR_AUTH_ADMIN_PWD = "ldapauth.bindPassword";
-
-    /*========================================================
-     * Job Scheduler
-     *========================================================*/
-    public final static String PR_JOBS_CLASS = "class";
-    public final static String PR_JOBS_IMPL_NAME = "implName";
-    public final static String PR_JOBS_FREQUENCY = "frequency";
-
-    /*========================================================
-     * Notification
-     *========================================================*/
-    public final static String PR_NOTIFICATION_FORM_NAME = "emailTemplate";
-    public final static String PR_NOTIFICATION_SUBJECT =
-            "emailSubject";
-    public final static String PR_NOTIFICATION_SENDER = "senderEmail";
-    public final static String PR_NOTIFICATION_RECEIVER = "recipientEmail";
-
-    /*========================================================
-     * Logs
-     *========================================================*/
-    public static final String PR_LOG_IMPL_NAME = "implName";
-    public static final String PR_EXT_PLUGIN_IMPLTYPE_LOG = "log";
-    public final static String PR_LOG_CLASS = "class";
-    public final static String PR_LOG_INSTANCE = "instanceName";
-    public final static String PR_LOG_ONE = "entry";
-    public final static String PR_LOG_ENTRY = "maxentry";
-    public final static String PR_LOG_SOURCE = "source";
-    public final static String PR_LOG_LEVEL = "level";
-    public final static String PR_LOG_ENABLED = "on";
-    public final static String PR_LOG_BUFFERSIZE = "bufferSize";
-    public final static String PR_LOG_EXPIRED_TIME = "expirationTime";
-    public final static String PR_LOG_FILENAME = "fileName";
-    public final static String PR_LOG_FLUSHINTERVAL = "flushInterval";
-    public final static String PR_LOG_MAXFILESIZE = "maxFileSize";
-    public final static String PR_LOG_ROLLEROVER_INTERVAL = "rolloverInterval";
-    public final static String PR_LOG_TYPE = "type";
-    public static final String PR_LOGSOURCE_KRA = "KRA";
-    public static final String PR_LOGSOURCE_RA = "RA";
-    public static final String PR_LOGSOURCE_CA = "CA";
-    public static final String PR_LOGSOURCE_HTTP = "HTTP";
-    public static final String PR_LOGSOURCE_DB = "DB";
-    public static final String PR_LOGSOURCE_AUTH = "AUTH";
-    public static final String PR_LOGSOURCE_ADMIN = "ADMIN";
-    public static final String PR_LOG_NAME = "logname";
-    public static final String PR_CURRENT_LOG = "current";
-
-    public static final String PR_AUTO_CRL = "auto";
-    public static final String PR_LOG_SIGNED_AUDIT = "SignedAudit";
-    public static final String PR_LOG_TRANSACTIONS = "Transactions";
-    public static final String PR_LOG_SYSTEM = "System";
-
-    public static final String PR_DEBUG_LOG_SHOWCALLER = "debug.showcaller";
-    public static final String PR_DEBUG_LOG_ENABLE = "debug.enabled";
-    public static final String PR_DEBUG_LOG_LEVEL = "debug.level";
-
-    /*========================================================
-     * LDAP Publishing
-     *========================================================*/
-
-    // publishing properties
-    public final static String PR_BASIC_AUTH = "BasicAuth";
-    public final static String PR_SSL_AUTH = "SslClientAuth";
-    public final static String PR_AUTH_TYPE = "ldapauth.authtype";
-    public final static String PR_BINDPWD_PROMPT = "ldapauth.bindPWPrompt";
-    public final static String PR_CERT_NAMES = "ldapauth.nicknames";
-    public final static String PR_LDAP_CLIENT_CERT = "ldapauth.clientCertNickname";
-    public final static String PR_DIRECTORY_MANAGER_PWD = "directoryManagerPwd";
-
-    // crl settings
-    public final static String PR_ENABLE_CRL = "enableCRLUpdates";
-    public final static String PR_UPDATE_SCHEMA = "updateSchema";
-    public final static String PR_EXTENDED_NEXT_UPDATE = "extendedNextUpdate";
-    public final static String PR_UPDATE_ALWAYS = "alwaysUpdate";
-    public final static String PR_ENABLE_DAILY = "enableDailyUpdates";
-    public final static String PR_DAILY_UPDATES = "dailyUpdates";
-    public final static String PR_ENABLE_FREQ = "enableUpdateInterval";
-    public final static String PR_UPDATE_FREQ = "autoUpdateInterval";
-    public final static String PR_GRACE_PERIOD = "nextUpdateGracePeriod";
-    public final static String PR_ENABLE_CACHE = "enableCRLCache";
-    public final static String PR_CACHE_FREQ = "cacheUpdateInterval";
-    public final static String PR_CACHE_RECOVERY = "enableCacheRecovery";
-    public final static String PR_CACHE_TESTING = "enableCacheTesting";
-    public final static String PR_EXTENSIONS = "allowExtensions";
-    public final static String PR_INCLUDE_EXPIREDCERTS = "includeExpiredCerts";
-    public final static String PR_INCLUDE_EXPIREDCERTS_ONEEXTRATIME = "includeExpiredCertsOneExtraTime";
-    public final static String PR_CA_CERTS_ONLY = "caCertsOnly";
-    public final static String PR_PROFILE_CERTS_ONLY = "profileCertsOnly";
-    public final static String PR_PROFILE_LIST = "profileList";
-    public final static String PR_SIGNING_ALGORITHM = "signingAlgorithm";
-    public final static String PR_MD2_RSA = "MD2withRSA";
-    public final static String PR_MD5_RSA = "MD5withRSA";
-    public final static String PR_SHA1_RSA = "SHA1withRSA";
-    public final static String PR_SHA1_DSA = "SHA1withDSA";
-    public final static String PR_DESCRIPTION = "description";
-    public final static String PR_CLASS = "class";
-
-    // ldap settings
-    public final static String PR_ENABLE = "enable";
-    public final static String PR_PUBLISHING_ENABLE = "publishingEnable";
-    public final static String PR_HOST_NAME = "ldapconn.host";
-    public final static String PR_SECURE_PORT_ENABLED = "ldapconn.secureConn";
-    public final static String PR_LDAP_PORT = "ldapconn.port";
-    public final static String PR_LDAP_VERSION = "ldapconn.version";
-    public final static String PR_BIND_DN = "ldapauth.bindDN";
-    public final static String PR_BIND_PASSWD = "ldapauth.bindPassword";
-    public final static String PR_BIND_PASSWD_AGAIN = "bindPasswdAgain";
-    public final static String PR_LDAP_MAX_CONNS = "maxConns";
-    public final static String PR_LDAP_MIN_CONNS = "minConns";
-    public final static String PR_PUBLISHING_QUEUE_ENABLE = "queue.enable";
-    public final static String PR_PUBLISHING_QUEUE_THREADS = "queue.maxNumberOfThreads";
-    public final static String PR_PUBLISHING_QUEUE_PAGE_SIZE = "queue.pageSize";
-    public final static String PR_PUBLISHING_QUEUE_PRIORITY = "queue.priorityLevel";
-    public final static String PR_PUBLISHING_QUEUE_STATUS = "queue.saveStatus";
-
-    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";
-    public final static String PR_CONN_OK = "connOk";
-    public final static String PR_CONN_FAIL = "connFail";
-    public final static String PR_AUTH_OK = "authOk";
-    public final static String PR_AUTH_FAIL = "authFail";
-    public final static String PR_SAVE_OK = "saveOk";
-    public final static String PR_SAVE_NOT = "saveOrNot";
-
-    /*========================================================
-     * Plugin
-     *========================================================*/
-    public final static String PR_PLUGIN_IMP = "imp";
-    public final static String PR_PLUGIN_INSTANCE = "instance";
-
-    /*========================================================
-     * Policy
-     *========================================================*/
-    public final static String PR_POLICY_CLASS = "class";
-    public final static String PR_POLICY_IMPL_NAME = "implName";
-    public final static String PR_CRLDP_NAME = "crldpName";
-    public final static String PR_POLICY_DESC = "desc";
-    public final static String PR_POLICY_ORDER = "order";
-    public final static String PR_POLICY_ENABLE = "enable";
-    public final static String PR_POLICY_PREDICATE = "predicate";
-
-    /*========================================================
-     * Publish
-     *========================================================*/
-    public final static String PR_PUBLISHER = "publisher";
-    public final static String PR_PUBLISHER_CLASS = "class";
-    public final static String PR_PUBLISHER_IMPL_NAME = "implName";
-    public final static String PR_PUBLISHER_DESC = "desc";
-    public final static String PR_PUBLISHER_ORDER = "order";
-    public final static String PR_PUBLISHER_ENABLE = "enable";
-
-    public final static String PR_MAPPER = "mapper";
-    public final static String PR_MAPPER_CLASS = "class";
-    public final static String PR_MAPPER_IMPL_NAME = "implName";
-    public final static String PR_MAPPER_DESC = "desc";
-    public final static String PR_MAPPER_ORDER = "order";
-    public final static String PR_MAPPER_ENABLE = "enable";
-
-    public final static String PR_RULE = "rule";
-    public final static String PR_RULE_CLASS = "class";
-    public final static String PR_RULE_IMPL_NAME = "implName";
-    public final static String PR_RULE_DESC = "desc";
-    public final static String PR_RULE_ORDER = "order";
-    public final static String PR_RULE_ENABLE = "enable";
-
-    public final static String PR_CRLEXT = "crlExt";
-    public final static String PR_CRLEXT_CLASS = "class";
-    public final static String PR_CRLEXT_IMPL_NAME = "implName";
-    public final static String PR_CRLEXT_DESC = "desc";
-    public final static String PR_CRLEXT_ORDER = "order";
-    public final static String PR_CRLEXT_ENABLE = "enable";
-
-    public final static String PR_OCSPSTORE_IMPL_NAME = "implName";
-
-    /*========================================================
-     * Registration Authority
-     *========================================================*/
-    public final static String PR_EE_ENABLED = "eeEnabled";
-    public final static String PR_OCSP_ENABLED = "ocspEnabled";
-    public final static String PR_RA_ENABLED = "raEnabled";
-    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_INTERVAL = "renewal.interval";
-    public final static String PR_SERVLET_CLASS = "class";
-    public final static String PR_SERVLET_URI = "uri";
-    public final static String PR_IMPL_NAME = "implName";
-    public final static String PR_LOCAL = "local";
-    public final static String PR_ID = "id";
-    public final static String PR_HOST = "host";
-    public final static String PR_URI = "uri";
-    public final static String PR_ENABLED = "enable";
-
-    /*========================================================
-     * Certificate Authority
-     *========================================================*/
-    public final static String PR_VALIDITY = "validity";
-    public final static String PR_DEFAULT_ALGORITHM = "defaultSigningAlgorithm";
-    public final static String PR_ALL_ALGORITHMS = "allSigningAlgorithms";
-    public final static String PR_SERIAL = "startSerialNumber";
-    public final static String PR_MAXSERIAL = "maxSerialNumber";
-
-    /*========================================================
-     * Access Control
-     *========================================================*/
-    public final static String PR_ACL_OPS = "aclOperations";
-    public final static String PR_ACI = "aci";
-    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
-     *========================================================*/
-    public final static String PR_AUTO_RECOVERY_ON = "autoRecoveryOn";
-    public final static String PR_RECOVERY_N = "recoveryN";
-    public final static String PR_RECOVERY_M = "recoveryM";
-    public final static String PR_OLD_RECOVERY_AGENT = "oldRecoveryAgent";
-    public final static String PR_RECOVERY_AGENT = "recoveryAgent";
-    public final static String PR_OLD_AGENT_PWD = "oldAgentPwd";
-    public final static String PR_AGENT_PWD = "agentPwd";
-    public final static String PR_NO_OF_REQUIRED_RECOVERY_AGENTS = "noOfRequiredRecoveryAgents";
-
-    /*========================================================
-     * Status
-     *========================================================*/
-    public final static String PR_STAT_STARTUP = "startup";
-    public final static String PR_STAT_TIME = "time";
-    public final static String PR_STAT_VERSION = "cms.version";
-    public final static String PR_STAT_INSTALLDATE = "installDate";
-    public final static String PR_STAT_INSTANCEID = "instanceId";
-
-    /*========================================================
-     * Server Instance
-     *========================================================*/
-    public final static String PR_INSTALL = "install";
-    public final static String PR_INSTANCES_INSTALL = "instancesInstall";
-    public final static String PR_CA_INSTANCE = "ca";
-    public final static String PR_OCSP_INSTANCE = "ocsp";
-    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
-     */
-    public final static String PR_CA_SIGNING_NICKNAME = "caSigningCert";
-    public final static String PR_PKCS10 = "pkcs10";
-    public final static String PR_CERT_SUBJECT_NAME = "certSubjectName";
-    public final static String PR_ISSUER_NAME = "issuerName";
-    public final static String PR_SERIAL_NUMBER = "serialNumber";
-    public final static String PR_BEFORE_VALIDDATE = "beforeValidDate";
-    public final static String PR_AFTER_VALIDDATE = "afterValidDate";
-    public final static String PR_CERT_FINGERPRINT = "certFingerPrint";
-    public final static String PR_SIGNATURE_ALGORITHM = "signatureAlg";
-    public final static String PR_ALGORITHM_ID = "algorithmId";
-    public final static String PR_NICKNAME = "nickname";
-    public final static String PR_ADD_CERT = "addCert";
-    public final static String PR_CERT_CONTENT = "certContent";
-
-    /*
-     * Certificate type
-     */
-    public final static String PR_CERTIFICATE_TYPE = "certType";
-    public final static String PR_CERTIFICATE_SUBTYPE = "certSubType";
-    public final static String PR_CA_SIGNING_CERT = "caSigningCert";
-    public final static String PR_RA_SIGNING_CERT = "raSigningCert";
-    public final static String PR_OCSP_SIGNING_CERT = "ocspSigningCert";
-    public final static String PR_KRA_TRANSPORT_CERT = "kraTransportCert";
-    public final static String PR_SERVER_CERT = "serverCert";
-    public final static String PR_SUBSYSTEM_CERT = "subsystemCert";
-    public final static String PR_SERVER_CERT_RADM = "serverCertRadm";
-    public final static String PR_CROSS_CERT = "crossCert";
-    public final static String PR_OTHER_CERT = "otherCert";
-    public final static String PR_SERVER_CERT_CHAIN = "serverCertChain";
-    public final static String PR_TRUSTED_CA_CERT = "trustedCACert";
-    public final static String PR_TRUSTED_CERT = "trustedCert";
-    public final static String PR_AUDIT_SIGNING_CERT = "auditSigningCert";
-
-    /*
-     * Extensions
-     */
-    public final static String PR_VALIDITY_PERIOD = "validityPeriod";
-    public final static String PR_BEGIN_YEAR = "beginYear";
-    public final static String PR_BEGIN_MONTH = "beginMonth";
-    public final static String PR_BEGIN_DATE = "beginDate";
-    public final static String PR_BEGIN_HOUR = "beginHour";
-    public final static String PR_BEGIN_MIN = "beginMin";
-    public final static String PR_BEGIN_SEC = "beginSec";
-    public final static String PR_AFTER_YEAR = "afterYear";
-    public final static String PR_AFTER_MONTH = "afterMonth";
-    public final static String PR_AFTER_DATE = "afterDate";
-    public final static String PR_AFTER_HOUR = "afterHour";
-    public final static String PR_AFTER_MIN = "afterMin";
-    public final static String PR_AFTER_SEC = "afterSec";
-    public final static String PR_AIA = "aia";
-    public final static String PR_AKI = "aki";
-    public final static String PR_OCSP_SIGNING = "ocspSigning";
-    public final static String PR_OCSP_NOCHECK = "ocspNoCheck";
-    public final static String PR_SKI = "ski";
-    public final static String PR_KEY_USAGE = "keyUsage";
-    public final static String PR_DER_EXTENSION = "derExtension";
-    public final static String PR_IS_CA = "isCA";
-    public final static String PR_CERT_LEN = "certLen";
-    public final static String PR_SSL_CLIENT_BIT = "sslClientBit";
-    public final static String PR_SSL_SERVER_BIT = "sslServerBit";
-    public final static String PR_SSL_MAIL_BIT = "sslMailBit";
-    public final static String PR_SSL_CA_BIT = "sslCABit";
-    public final static String PR_OBJECT_SIGNING_BIT = "objectSigningBit";
-    public final static String PR_MAIL_CA_BIT = "mailCABit";
-    public final static String PR_OBJECT_SIGNING_CA_BIT = "objectSigningCABit";
-    public final static String PR_TIMESTAMPING_BIT = "timeStampingBit";
-    public final static String PR_CA_KEYID = "caKeyid";
-    public final static String PR_CA_KEYPAIR = "caKeyPair";
-
-    /**
-     * Trust database
-     */
-    public final static String PR_TRUST = "trust";
-
-    /*========================================================
-     * Security
-     *========================================================*/
-
-    //functionality
-    public final static String PR_CERT_SERVER = "SERVER";
-    public final static String PR_CERT_ADMIN = "ADMIN";
-    public final static String PR_CERT_AGENT = "AGENT";
-    public final static String PR_CERT_EE = "EE";
-    public final static String PR_CERT_CA = "CA";
-    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";
-    public final static String PR_REQUEST_TYPE = "request";
-    //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_TOKEN_NAME = "tokenName";
-    public final static String PR_TOKEN_PASSWD = "tokenPwd";
-    public final static String PR_KEY_LENGTH = "keyLength";
-    public final static String PR_KEY_CURVENAME = "keyCurveName";
-    public static final String PR_SIGNEDBY_TYPE = "signedBy";
-    public final static String PR_KEY_TYPE = "keyType";
-    public final static String PR_PQGPARAMS = "pqgParams";
-    public final static String PR_CERT_REQUEST = "certReq";
-    public final static String PR_CERT_REQUEST_DIR = "certReqDir";
-    public final static String PR_CERT_CONFIG_DIR = "certConfigDir";
-    public final static String PR_IMPORT_CERT = "importCert";
-    public final static String PR_SUBJECT_NAME = "subjectName";
-    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_";
-    public final static String PR_INTERNAL_TOKEN = "internal";
-    public final static String PR_KEY_LIST = "keylist";
-
-    /* SSL Cipher Preferences */
-    public final static String PR_CIPHER_PREF = "cipherpref";
-
-    /* SSL EC Type */
-    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";
-
-    /*========================================================
-     * Watchdog and Server State Messages
-     *========================================================*/
-
-    public final static String SERVER_STARTUP_WARNING_MESSAGE = "CMS Warning: ";
-    public final static String SERVER_STARTUP_MESSAGE = "Server is started.";
-    public final static String SERVER_SHUTDOWN_MESSAGE = "Shutting down.";
-    public final static String SERVER_SHUTDOWN_ERROR_MESSAGE = "Error Starting CMS: ";
-    public final static String SERVER_SHUTDOWN_EXTENDED_ERROR_MESSAGE = "Extended error information: ";
-
-    /*============================================================
-     * THE FOLLOWING LIST WILL BE REMOVED
-     *============================================================*/
-
-    // parameter types
-    public final static String PT_OP = "op";
-    public final static String PT_MOD_TYPE = "modType";
-    public final static String PT_MOD_OP = "modOp";
-    public final static String MOD_REPLACE = "modOpReplace";
-    public final static String MOD_ADD = "modOpAdd";
-    public final static String MOD_DELETE = "modOpDelete";
-    public final static String PT_MOD_VALUE = "modValue";
-
-    // generic operations
-    public final static String OP_SET = "set";
-    public final static String OP_GET = "get";
-    public final static String OP_LIST = "list";
-
-    // certificate server operations
-    public final static String CERTSRV_ID = "certsrv";
-
-    public final static String PT_PORT = "http.http.port";
-    public final static String PT_SSL_PORT = "http.https.port";
-    public final static String PT_MAPPING = "mapping";
-    public final static String PT_DN = "dn";
-
-    public final static String PV_SYSTEM_ADMINISTRATORS =
-            "SystemAdministrators";
-    public final static String PV_CERTIFICATE_ADMINISTRATORS =
-            "CertificateAdministrators";
-
-    public final static String OP_AUTHENTICATE = "authenticate";
-    public final static String OP_RESTART = "restart";
-    public final static String OP_STOP = "stop";
-
-    // access manager operation
-    public final static String PT_ACLS = "acls";
-    public final static String OP_GET_ACLS = "getACLs";
-
-    // authentication operations
-    public final static String AUTH_ID = "auth";
-    public final static String OP_FIND_USERS = "findUsers";
-    public final static String OP_FIND_GROUPS = "findGroups";
-    public final static String OP_GET_USER = "getUser";
-    public final static String OP_GET_GROUP = "getGroup";
-    public final static String OP_ADD_USER = "addUser";
-    public final static String OP_ADD_GROUP = "addGroup";
-    public final static String OP_MODIFY_USER = "modifyUser";
-    public final static String OP_MODIFY_GROUP = "modifyGroup";
-
-    public final static String PT_USER = "user";
-    public final static String PT_GROUP = "group";
-
-    // common operations
-    public final static String OP_LOCK_REQUEST = "lockRequest";
-    public final static String OP_MODIFY_REQUEST = "modifyRequest";
-    public final static String OP_EXECUTE_REQUEST = "executeRequest";
-    public final static String OP_ACCEPT_REQUEST = "acceptRequest";
-    public final static String OP_REJECT_REQUEST = "rejectRequest";
-    public final static String OP_CANCEL_REQUEST = "cancelRequest";
-
-    // 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";
-    public final static String PT_PUBLISH_FREQ =
-            "crl.crl0.autoUpdateInterval";
-    public final static String PT_SERIALNO = "serialno";
-    public final static String PT_NAMES = "names";
-    public final static String PT_CERTIFICATES = "certificates";
-    public final static String PT_CERT_RECORDS = "certRecords";
-    public final static String PT_REQUESTS = "requests";
-    public final static String PT_REQUEST = "request";
-    public final static String PT_EXTENSIONS = "extensions";
-    public final static String PT_FILTER = "filter";
-    public final static String PT_ATTRS = "attrs";
-    public final static String PT_RESULT_ID = "resultId";
-    public final static String PT_START_NO = "startNo";
-    public final static String PT_END_NO = "endNo";
-    public final static String PT_SIZE = "size";
-    public final static String PT_RELEASE = "release";
-    public final static String PT_CERTREC = "certrec";
-    public final static String PT_COMMENT = "comment";
-    public final static String PT_REASON_NO = "reasonNo";
-
-    public final static String OP_CRL_PUBLISH = "publish_now";
-    public final static String OP_FIND_CERTIFICATES = "findCertificates";
-    public final static String OP_FIND_CERT_RECORDS = "findCertRecords";
-    public final static String OP_FIND_REQUESTS = "findRequests";
-    public final static String OP_LOCK_CERT_RECORD = "lockCertRecord";
-    public final static String OP_MODIFY_CERT_RECORD = "modifyCertRecord";
-    public final static String OP_GET_EXTENSIONS = "getExtensions";
-    public final static String OP_REVOKE_CERT = "revokeCert";
-    public final static String OP_RENEW_CERT = "renewCert";
-    public final static String OP_GET_CACERT_CHAIN = "getCACertChain";
-
-    // escrow authority operations
-    public final static String PT_OLD_PASSWORD = "oldpassword";
-    public final static String PT_NEW_PASSWORD = "newpassword";
-    public final static String PT_KEY_RECORD = "keyRecord";
-
-    public final static String OP_FIND_KEY_RECORDS = "findKeyRecords";
-    public final static String OP_LOCK_KEY_RECORD = "lockKeyRecord";
-    public final static String OP_MODIFY_KEY_RECORD = "modifyKeyRecord";
-    public final static String OP_RECOVER_KEY = "recoverKey";
-
-    // centralized cetificate management operations
-    public final static String PT_NOTIF_EMAIL = "notificationEmail";
-    public final static String PT_NOTIF_ENABLE = "notificationEnable";
-    public final static String PT_NOTIF_EXPIRE = "notificationExpiration";
-    public final static String PT_NOTIF_RENEWAL = "notificationRewnewal";
-    public final static String PT_DIST_STORE = "storeUserPassword";
-    public final static String PT_DIST_EMAIL = "emailUserPassword";
-    public final static String PT_REQUEST_LOG = "requestLog";
-    public final static String PT_ACCESS_LOG = "accessLog";
-    public final static String PT_ERROR_LOG = "errorLog";
-    public final static String PR_NT_EVENT_SOURCE = "NTEventSourceName";
-    public final static String PR_NT_LOG_LEVEL = "level";
-    public final static String PR_NT_LOG_ENABLED = "on";
-
-    public final static String OP_GET_ACCESS_LOG = "getAccessLog";
-    public final static String OP_GET_ERROR_LOG = "getErrorLog";
-    public final static String OP_GET_REQUEST_LOG = "getRequestLog";
-
-    public final static String PR_NICK_NAME = "nickName"; // capital N
-    public final static String PR_LOGGED_IN = "isLoggedIn";
-
-    // User Type
-    public final static String PR_USER_TYPE = "userType";
-    public final static String PR_ADMIN_TYPE = "adminType";
-    public final static String PR_AGENT_TYPE = "agentType";
-    public final static String PR_SUBSYSTEM_TYPE = "subsystemType";
-
-    // Extended plugin information
-    public final static String PR_EXT_PLUGIN_IMPLNAME = "implName";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE = "implType";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_POLICY = "policy";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_JOBS = "jobs";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_AUTH = "auth";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_LISTENER = "listener";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_PUBLISHRULE = "publishrule";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_PUBLISHER = "publisher";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_MAPPER = "mapperrule";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_CRLEXTSRULE = "crlExtensions";
-    public final static String PR_EXT_PLUGIN_IMPLTYPE_OCSPSTORESRULE = "ocspStores";
-
-    // Miscellaneous
-    public final static String PR_CERT_FILEPATH = "certFilePath";
-    public final static String PR_SERVER_ROOT = "serverRoot";
-    public final static String PR_SERVER_ID = "serverID";
-    public final static String PR_NT = "NT";
-    public final static String PR_TIMEOUT = "timeout";
-    public final static String PR_ALL_NICKNAMES = "allNicknames";
-
-    // request status
-    public final static String PR_REQUEST_SUCCESS = "2";
-    public final static String PR_REQUEST_PENDING = "3";
-    public final static String PR_REQUEST_SVC_PENDING = "4";
-    public final static String PR_REQUEST_REJECTED = "5";
-
-    //Profile
-    public final static String PR_CONSTRAINTS_LIST = "constraintPolicy";
-
-    //Replication
-    public final static String PR_REPLICATION_ENABLED = "replication.enabled";
-    public final static String PR_REPLICATION_AGREEMENT_NAME_1 = "replication.master1.name";
-    public final static String PR_REPLICATION_HOST_1 = "replication.master1.hostname";
-    public final static String PR_REPLICATION_PORT_1 = "replication.master1.port";
-    public final static String PR_REPLICATION_BINDDN_1 = "replication.master1.binddn";
-    public final static String PR_REPLICATION_CHANGELOGDB_1 = "replication.master1.changelogdb";
-    public final static String PR_REPLICATION_AGREEMENT_NAME_2 = "replication.master2.name";
-    public final static String PR_REPLICATION_HOST_2 = "replication.master2.hostname";
-    public final static String PR_REPLICATION_PORT_2 = "replication.master2.port";
-    public final static String PR_REPLICATION_BINDDN_2 = "replication.master2.binddn";
-    public final static String PR_REPLICATION_CHANGELOGDB_2 = "replication.master2.changelogdb";
-}
diff --git a/base/console/src/com/netscape/certsrv/common/DestDef.java b/base/console/src/com/netscape/certsrv/common/DestDef.java
deleted file mode 100644
index 188fb5c9fb63241f4354ba77da0e4fd54ddb11b6..0000000000000000000000000000000000000000
--- a/base/console/src/com/netscape/certsrv/common/DestDef.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- 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.
- *
- * @author Jack Pan-Chen
- * @version $Revision$, $Date$
- */
-public interface DestDef {
-
-    public final static String DEST_CA_ADMIN = "caadmin";
-    public final static String DEST_OCSP_ADMIN = "ocsp";
-    public final static String DEST_RA_ADMIN = "ra";
-    public final static String DEST_KRA_ADMIN = "kra";
-    public final static String DEST_CA_SERVLET_ADMIN = "caservlet";
-    public final static String DEST_KRA_SERVLET_ADMIN = "kraservlet";
-    public final static String DEST_RA_SERVLET_ADMIN = "raservlet";
-    public final static String DEST_REGISTRY_ADMIN = "registry";
-    public final static String DEST_CA_PROFILE_ADMIN = "caprofile";
-    public final static String DEST_RA_PROFILE_ADMIN = "raprofile";
-    public final static String DEST_CA_POLICY_ADMIN = "capolicy";
-    public final static String DEST_RA_POLICY_ADMIN = "rapolicy";
-    public final static String DEST_KRA_POLICY_ADMIN = "krapolicy";
-    public final static String DEST_LOG_ADMIN = "log";
-    public final static String DEST_GROUP_ADMIN = "ug";
-    public final static String DEST_USER_ADMIN = "ug";
-    public final static String DEST_AUTH_ADMIN = "auths";
-    public final static String DEST_JOBS_ADMIN = "jobsScheduler";
-    public final static String DEST_NOTIFICATION_ADMIN = "notification";
-    public final static String DEST_SERVER_ADMIN = "server";
-    public final static String DEST_ACL_ADMIN = "acl";
-    public final static String DEST_CA_PUBLISHER_ADMIN = "capublisher";
-    public final static String DEST_RA_PUBLISHER_ADMIN = "rapublisher";
-    public final static String DEST_CA_MAPPER_ADMIN = "camapper";
-    public final static String DEST_RA_MAPPER_ADMIN = "ramapper";
-    public final static String DEST_CA_RULE_ADMIN = "carule";
-    public final static String DEST_RA_RULE_ADMIN = "rarule";
-}
diff --git a/base/console/src/com/netscape/certsrv/common/NameValuePairs.java b/base/console/src/com/netscape/certsrv/common/NameValuePairs.java
deleted file mode 100644
index 30491cdd050d6d0ff9af8b3d1031fe4b17953e5f..0000000000000000000000000000000000000000
--- a/base/console/src/com/netscape/certsrv/common/NameValuePairs.java
+++ /dev/null
@@ -1,82 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- END COPYRIGHT BLOCK ---
-package com.netscape.certsrv.common;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-/**
- * A class represents an ordered list of name
- * value pairs.
- *
- * @version $Revision$, $Date$
- */
-public class NameValuePairs extends LinkedHashMap<String, String> {
-
-    private static final long serialVersionUID = 1494507857048437440L;
-
-    /**
-     * Constructs name value pairs.
-     */
-    public NameValuePairs() {
-    }
-
-    /**
-     * Show the content of this name value container as
-     * string representation.
-     *
-     * @return string representation
-     */
-    public String toString() {
-        StringBuilder buf = new StringBuilder();
-
-        for (Map.Entry<String, String> entry : entrySet()) {
-
-            buf.append(String.format("%s=%s", entry.getKey(), entry.getValue()));
-            buf.append("\n");
-        }
-
-        return buf.toString();
-    }
-
-    /**
-     * Parses a string into name value pairs.
-     *
-     * @param s string
-     * @param nvp name value pairs
-     * @return true if successful
-     */
-    public static boolean parseInto(String s, NameValuePairs nvp) {
-        StringTokenizer st = new StringTokenizer(s, "&");
-
-        while (st.hasMoreTokens()) {
-            String t = st.nextToken();
-            int i = t.indexOf("=");
-
-            if (i == -1) {
-                return false;
-            }
-            String n = t.substring(0, i);
-            String v = t.substring(i + 1);
-
-            nvp.put(n, v);
-        }
-        return true;
-    }
-}
diff --git a/base/console/src/com/netscape/certsrv/common/OpDef.java b/base/console/src/com/netscape/certsrv/common/OpDef.java
deleted file mode 100644
index 28cc31f595c7d6a3f6849c35f9a119eae489389b..0000000000000000000000000000000000000000
--- a/base/console/src/com/netscape/certsrv/common/OpDef.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- 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.
- *
- * @author Jack Pan-Chen
- * @version $Revision$, $Date$
- */
-public interface OpDef {
-
-    public final static String OP_ADD = "OP_ADD";
-    public final static String OP_DELETE = "OP_DELETE";
-    public final static String OP_MODIFY = "OP_MODIFY";
-    public final static String OP_READ = "OP_READ";
-    public final static String OP_SEARCH = "OP_SEARCH";
-    public final static String OP_AUTH = "OP_AUTH";
-    public final static String OP_JOBS = "OP_JOBS";
-    public final static String OP_PROCESS = "OP_PROCESS";
-    public final static String OP_VALIDATE = "OP_VALIDATE";
-}
diff --git a/base/console/src/com/netscape/certsrv/common/PrefixDef.java b/base/console/src/com/netscape/certsrv/common/PrefixDef.java
deleted file mode 100644
index 01a722f91e92d30eb8266db39f796a0ebb1c7ed8..0000000000000000000000000000000000000000
--- a/base/console/src/com/netscape/certsrv/common/PrefixDef.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- 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.
- *
- * @author Jack Pan-Chen
- * @version $Revision$, $Date$
- */
-public interface PrefixDef {
-
-    //user and group
-    public final static String PX_GROUP = "group";
-    public final static String PX_USER = "user";
-    public final static String PX_CERT = "cert";
-    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/base/console/src/com/netscape/certsrv/common/ScopeDef.java b/base/console/src/com/netscape/certsrv/common/ScopeDef.java
deleted file mode 100644
index f689d1504d2cebf8868246e0ce51653a3d78d291..0000000000000000000000000000000000000000
--- a/base/console/src/com/netscape/certsrv/common/ScopeDef.java
+++ /dev/null
@@ -1,194 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- 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.
- *
- * @author Jack Pan-Chen
- * @version $Revision$, $Date$
- */
-public interface ScopeDef {
-
-    // users and groups
-    public final static String SC_GROUPS = "groups";
-    public final static String SC_GROUP_MEMBERS = "members";
-    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";
-    public final static String SC_ENCRYPTION = "encryption";
-    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_POLICIES = "policies";
-    public final static String SC_PROFILE_POLICY_CONFIG = "config";
-    public final static String SC_PROFILE_INPUT = "profileInput";
-    public final static String SC_PROFILE_INPUT_CONFIG = "profileInputConfig";
-    public final static String SC_PROFILE_OUTPUT = "profileOutput";
-    public final static String SC_PROFILE_OUTPUT_CONFIG = "profileOutputConfig";
-
-    // policy management
-    public final static String SC_POLICY_RULES = "rules";
-    public final static String SC_POLICY_IMPLS = "impls";
-    public final static String SC_POLICY_CRLDPS = "crldps";
-
-    // publisher management
-    public final static String SC_PUBLISHER_RULES = "publisherRules";
-    public final static String SC_PUBLISHER_IMPLS = "publisherImpls";
-    public final static String SC_MAPPER_RULES = "mapperRules";
-    public final static String SC_MAPPER_IMPLS = "mapperImpls";
-    public final static String SC_RULE_RULES = "ruleRules";
-    public final static String SC_RULE_IMPLS = "ruleImpls";
-
-    // self tests
-    public final static String SC_SELFTESTS = "selftests";
-
-    // log config
-    public final static String SC_AUDITLOG = "transactionsLog";
-    public final static String SC_NTAUDITLOG = "ntTransactionsLog";
-    public final static String SC_ERRORLOG = "errorLog";
-    public final static String SC_SYSTEMLOG = "systemLog";
-    public final static String SC_NTSYSTEMLOG = "ntSystemLog";
-    public final static String SC_LOG_ARCH = "logArch";
-    public final static String SC_LOG_RULES = "logRule";
-    public final static String SC_LOG_IMPLS = "logImpls";
-
-    // log contents
-    public final static String SC_LOG_INSTANCES = "log_instances";
-    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";
-
-    //LDAP publishing
-    public final static String SC_LDAP = "ldap";
-    public final static String SC_CRL = "crl";
-    public final static String SC_USERCERT = "userCert";
-    public final static String SC_CACERT = "caCert";
-    public final static String SC_CAMAPPER = "caMapper";
-    public final static String SC_CAPUBLISHER = "caPublisher";
-    public final static String SC_USERMAPPER = "userMapper";
-    public final static String SC_USERPUBLISHER = "userPublisher";
-
-    // CRL issuing points
-    public final static String SC_CRLIPS = "crlIPs";
-
-    // CRL extensions
-    public final static String SC_CRLEXTS_RULES = "crlExtsRules";
-
-    public final static String SC_OCSPSTORES_RULES = "ocspStoresRules";
-    public final static String SC_OCSPSTORE_DEFAULT = "ocspStoreDef";
-
-    // KRA
-    public final static String SC_AUTO_RECOVERY = "autoRecovery";
-    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";
-
-    // RA
-    public final static String SC_GENERAL = "general";
-    public final static String SC_CLM = "clm";
-    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";
-    public final static String SC_AUTH_IMPLS = "impl";
-    public final static String SC_AUTH_MGR_INSTANCE = "instance";
-
-    //jobs scheduler
-    public final static String SC_JOBS = "jobScheduler";
-    public final static String SC_JOBS_IMPLS = "impl";
-    public final static String SC_JOBS_INSTANCE = "job";
-    public final static String SC_JOBS_RULES = "rules";
-
-    //notification
-    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";
-    public final static String SC_EVALUATOR_TYPES = "evaluatorTypes";
-
-    // token
-    public final static String SC_TOKEN = "token";
-
-    // keycert
-    public final static String SC_CA_SIGNINGCERT = "caSigningCert";
-    public final static String SC_RA_SIGNINGCERT = "raSigningCert";
-    public final static String SC_KRA_TRANSPORTCERT = "kraTransportCert";
-    public final static String SC_SERVER_CERT = "serverCert";
-    public final static String SC_SERVER_CERTCHAIN = "serverCertChain";
-    public final static String SC_TRUSTED_CACERT = "trustedCACert";
-    public final static String SC_TRUSTED_CERT = "trustedCert";
-    public final static String SC_SUBJECT_NAME = "subjectName";
-    public final static String SC_CERTINFO = "certInfo";
-    public final static String SC_CERT_REQUEST = "certRequest";
-    public final static String SC_ISSUE_IMPORT_CERT = "issueImportCert";
-    public final static String SC_INSTALL_CERT = "installCert";
-    public final static String SC_IMPORT_CROSS_CERT = "importXCert";
-    public final static String SC_CA_CERTLIST = "caCertList";
-    public final static String SC_ALL_CERTLIST = "allCertList";
-    public final static String SC_DELETE_CERTS = "deleteCert";
-    public final static String SC_CERT_PRETTY_PRINT = "certPrint";
-    public final static String SC_TRUST = "trust";
-
-    // Key Pair
-    public final static String SC_KEY_LENGTH = "keyLength";
-    public final static String SC_KEY_CURVENAME = "keyCurveName";
-    public final static String SC_CERTIFICATE_EXTENSION = "certificateExt";
-    public final static String SC_TOKEN_STATUS = "tokenStatus";
-    public final static String SC_TOKEN_LOGON = "tokenLogon";
-
-    public final static String SC_EXTENDED_PLUGIN_INFO = "extendedPluginInfo";
-
-    public final static String SC_USER_TYPE = "userType";
-    public final static String SC_PLATFORM = "platform";
-
-    public final static String SC_GET_NICKNAMES = "getNicknames";
-
-    // Profile
-    public final static String SC_SUPPORTED_CONSTRAINTPOLICIES = "supportedConstraintPolicies";
-
-    // Manage certificate admin
-    public final static String SC_USERCERTSLIST = "userCertsList";
-    public final static String SC_TKSKEYSLIST = "tksKeysList";
-    public final static String SC_ROOTCERTSLIST = "rootCertsList";
-    public final static String SC_ROOTCERT_TRUSTBIT = "rootTrustBit";
-}
diff --git a/base/console/src/com/netscape/certsrv/common/TaskId.java b/base/console/src/com/netscape/certsrv/common/TaskId.java
deleted file mode 100644
index bd6f970b3809657933809e29c4eddcd24f2faa44..0000000000000000000000000000000000000000
--- a/base/console/src/com/netscape/certsrv/common/TaskId.java
+++ /dev/null
@@ -1,131 +0,0 @@
-// --- BEGIN COPYRIGHT BLOCK ---
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; version 2 of the License.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this program; if not, write to the Free Software Foundation, Inc.,
-// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-// (C) 2007 Red Hat, Inc.
-// All rights reserved.
-// --- 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.
- *
- * @author Christine Ho
- * @version $Revision$, $Date$
- */
-public interface TaskId {
-
-    // list out all the previously performed tasks
-    public final static String TASK_LIST_PREVIOUS_STAGES = "listPreviousStages";
-
-    // retrieve all information in the previously performed tasks
-    public final static String TASK_GET_DEFAULT_INFO = "getStagesInfo";
-
-    // retrieve all information to setup the wizardInfo
-    public final static String TASK_SETUP_WIZARDINFO = "setupWizardInfo";
-
-    // services to be installed: ca, kra, ra
-    public final static String TASK_INSTALL_SUBSYSTEMS = "installSubsystems";
-
-    // create the internal database
-    public final static String TASK_CREATE_INTERNALDB = "createInternalDB";
-
-    // configure network ports
-    public final static String TASK_CONFIGURE_NETWORK = "configureNetwork";
-
-    // setup certificate administrator
-    public final static String TASK_SETUP_ADMINISTRATOR = "setupAdmin";
-
-    // select subsystems
-    public final static String TASK_SELECT_SUBSYSTEMS = "selectSubsystems";
-
-    // data migration
-    public final static String TASK_MIGRATION = "migration";
-
-    // create certificate
-    public final static String TASK_CREATE_CERT = "createCert";
-
-    // kra storage key
-    public final static String TASK_STORAGE_KEY = "storageKey";
-
-    // kra agents
-    public final static String TASK_AGENTS = "agents";
-
-    // get information about all cryptotokens
-    public final static String TASK_TOKEN_INFO = "tokenInfo";
-
-    // get master or clone setting
-    public final static String TASK_MASTER_OR_CLONE = "SetMasterOrClone";
-
-    // single signon
-    public final static String TASK_SINGLE_SIGNON = "singleSignon";
-
-    // init token
-    public final static String TASK_INIT_TOKEN = "initToken";
-
-    // certificate request
-    public final static String TASK_CERT_REQUEST = "certRequest";
-
-    // certificate request submited successfully
-    public final static String TASK_REQUEST_SUCCESS = "reqSuccess";
-
-    // certificate content
-    public final static String TASK_GET_CERT_CONTENT = "certContent";
-
-    public final static String TASK_IMPORT_CERT_CHAIN = "importCertChain";
-
-    // install certificate
-    public final static String TASK_INSTALL_CERT = "installCert";
-
-    public final static String TASK_CHECK_DN = "checkDN";
-
-    // miscellaneous things
-    public final static String TASK_MISCELLANEOUS = "doMiscStuffs";
-
-    // validate directory manager password
-    public final static String TASK_VALIDATE_DSPASSWD = "validateDSPassword";
-
-    // set CA starting serial number
-    public final static String TASK_SET_CA_SERIAL = "setCASerial";
-
-    // set KRA request and key starting and ending number
-    public final static String TASK_SET_KRA_NUMBER = "setKRANumber";
-
-    // check key length
-    public final static String TASK_CHECK_KEYLENGTH = "checkKeyLength";
-
-    // check certificate extension
-    public final static String TASK_CHECK_EXTENSION = "checkExtension";
-
-    // check validity period: make sure the notAfterDate of the certificate
-    // will not go beyond the notAfterDate of the CA cert which signs the certificate.
-    public final static String TASK_VALIDITY_PERIOD = "checkValidityPeriod";
-
-    public final static String TASK_CLONING = "taskCloning";
-    public final static String TASK_CLONE_MASTER = "taskCloneMaster";
-
-    // daemon exit
-    public final static String TASK_EXIT = "exit";
-
-    public final static String TASK_ADD_OCSP_SERVICE = "addOCSPService";
-
-    public final static String TASK_CONFIG_WEB_SERVER = "configWebServer";
-
-    public final static String TASK_CREATE_REPLICATION_AGREEMENT = "createReplAgreement";
-    public final static String TASK_LOGON_ALL_TOKENS = "logonAllTokens";
-    public final static String TASK_UPDATE_DB_INFO = "updateDBInfo";
-    public final static String TASK_ADD_DBSCHEMA_INDEXES = "addDBSchemaIndexes";
-}
-- 
1.7.7.6

