diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/key')
14 files changed, 309 insertions, 357 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java index 1fe0e2f1..0e3b08c6 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/ConfirmRecoverBySerial.java @@ -18,31 +18,30 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java index fc1d9e8f..fa762e96 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerial.java @@ -18,31 +18,31 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java index dcc68759..3b340672 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayBySerialForRecovery.java @@ -18,31 +18,32 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java index e52bb44e..ac567bee 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/DisplayTransport.java @@ -18,31 +18,21 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.base.*; -import com.netscape.cms.servlet.common.*; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.ITransportKeyUnit; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java index 4d4607ba..e01a124d 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/ExamineRecovery.java @@ -18,35 +18,33 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Hashtable; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java b/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java index 36d99193..fab14919 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GetApprovalStatus.java @@ -18,36 +18,32 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.security.Credential; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java b/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java index 47ed5d0e..52bd8ef3 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GetAsyncPk12.java @@ -18,35 +18,29 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java b/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java index 4c5f86c3..27bf3418 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GetPk12.java @@ -18,35 +18,30 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java index dbb5356c..860dc901 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GrantAsyncRecovery.java @@ -17,36 +17,28 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.key; -import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java index 8119e4e3..356980ae 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/GrantRecovery.java @@ -18,35 +18,29 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; - -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.kra.IKeyService; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java b/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java index 709f3433..9ce8585f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/KeyRecordParser.java @@ -18,26 +18,13 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; +import java.util.Date; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; /** * Output a 'pretty print' of a Key Archival record diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java index b1b46807..f990e0db 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/RecoverBySerial.java @@ -18,6 +18,20 @@ package com.netscape.cms.servlet.key; +import java.io.IOException; +import java.math.BigInteger; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X509CertImpl; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authorization.AuthzToken; @@ -34,18 +48,6 @@ import com.netscape.cms.servlet.common.CMSTemplate; import com.netscape.cms.servlet.common.CMSTemplateParams; import com.netscape.cms.servlet.common.ECMSGWException; import com.netscape.cmsutil.util.Cert; -import netscape.security.x509.X509CertImpl; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.math.BigInteger; -import java.util.Hashtable; -import java.util.Locale; -import java.util.Vector; /** * A class representing a recoverBySerial servlet. diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java index 21e61ed7..ea219d1c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKey.java @@ -18,31 +18,33 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve archived keys matching search criteria diff --git a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java index bd5bca4d..fc9e6966 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java +++ b/pki/base/common/src/com/netscape/cms/servlet/key/SrchKeyForRecovery.java @@ -18,31 +18,33 @@ package com.netscape.cms.servlet.key; -import com.netscape.cms.servlet.common.*; -import com.netscape.cms.servlet.base.*; - -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; -import javax.servlet.*; -import javax.servlet.http.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; - -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cms.servlet.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Locale; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzAccessDenied; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.servlet.base.CMSServlet; +import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cms.servlet.common.CMSTemplate; +import com.netscape.cms.servlet.common.CMSTemplateParams; +import com.netscape.cms.servlet.common.ECMSGWException; /** * Retrieve archived keys matching given public key material |