From 4f97d6f686b00237d06bd34c70f8cad5abbff74d Mon Sep 17 00:00:00 2001 From: admiyo Date: Fri, 4 Nov 2011 19:48:54 +0000 Subject: Cleanup imports Automated changes done by Eclipse Minor tweak to one file where Eclipse was tring to find an import for Any Due to finding it in an annotated comment. https://bugzilla.redhat.com/show_bug.cgi?id=728303 git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2292 c9f7a03b-bd48-0410-a16d-cbbf54688b0b --- .../src/com/netscape/cmscore/apps/CMSEngine.java | 204 ++++++++++++++------- .../com/netscape/cmscore/apps/CommandQueue.java | 5 +- .../src/com/netscape/cmscore/apps/Setup.java | 6 +- .../src/com/netscape/cmscore/apps/Upgrade.java | 13 +- .../cmscore/authentication/AuthSubsystem.java | 28 ++- .../authentication/CertUserDBAuthentication.java | 46 ++--- .../ChallengePhraseAuthentication.java | 46 +++-- .../cmscore/authentication/NullAuthentication.java | 17 +- .../authentication/PasswdUserDBAuthentication.java | 40 ++-- .../SSLClientCertAuthentication.java | 43 +++-- .../cmscore/authentication/VerifiedCert.java | 4 +- .../cmscore/authentication/VerifiedCerts.java | 4 +- .../cmscore/authorization/AuthzSubsystem.java | 27 ++- .../src/com/netscape/cmscore/base/ArgBlock.java | 18 +- .../com/netscape/cmscore/base/FileConfigStore.java | 15 +- .../cmscore/base/JDialogPasswordCallback.java | 28 ++- .../com/netscape/cmscore/base/PropConfigStore.java | 19 +- .../netscape/cmscore/base/SimpleProperties.java | 13 +- .../netscape/cmscore/base/SourceConfigStore.java | 2 +- .../com/netscape/cmscore/base/SubsystemLoader.java | 7 +- .../netscape/cmscore/base/SubsystemRegistry.java | 3 +- .../com/netscape/cmscore/cert/CertDateCompare.java | 6 +- .../com/netscape/cmscore/cert/CertPrettyPrint.java | 12 +- .../src/com/netscape/cmscore/cert/CertUtils.java | 55 ++++-- .../com/netscape/cmscore/cert/CertificatePair.java | 20 +- .../netscape/cmscore/cert/CrlCachePrettyPrint.java | 22 ++- .../com/netscape/cmscore/cert/CrlPrettyPrint.java | 12 +- .../cmscore/cert/CrossCertPairSubsystem.java | 44 +++-- .../com/netscape/cmscore/cert/ExtPrettyPrint.java | 14 +- .../netscape/cmscore/cert/OidLoaderSubsystem.java | 26 ++- .../netscape/cmscore/cert/PrettyPrintFormat.java | 5 +- .../cmscore/cert/PrettyPrintResources.java | 7 +- .../netscape/cmscore/cert/PubKeyPrettyPrint.java | 10 +- .../netscape/cmscore/cert/X500NameSubsystem.java | 25 ++- .../cmscore/connector/HttpConnFactory.java | 20 +- .../netscape/cmscore/connector/HttpConnection.java | 22 ++- .../netscape/cmscore/connector/HttpConnector.java | 26 ++- .../netscape/cmscore/connector/HttpPKIMessage.java | 15 +- .../cmscore/connector/HttpRequestEncoder.java | 12 +- .../netscape/cmscore/connector/LocalConnector.java | 25 ++- .../cmscore/connector/RemoteAuthority.java | 5 +- .../cmscore/connector/RequestTransfer.java | 8 +- .../com/netscape/cmscore/connector/Resender.java | 28 +-- .../src/com/netscape/cmscore/crmf/CRMFParser.java | 24 +-- .../cmscore/crmf/PKIArchiveOptionsContainer.java | 2 +- .../com/netscape/cmscore/dbs/BigIntegerMapper.java | 15 +- .../com/netscape/cmscore/dbs/ByteArrayMapper.java | 15 +- .../src/com/netscape/cmscore/dbs/CRLDBSchema.java | 7 - .../cmscore/dbs/CRLIssuingPointRecord.java | 22 +-- .../com/netscape/cmscore/dbs/CRLRepository.java | 32 ++-- .../src/com/netscape/cmscore/dbs/CertDBSchema.java | 7 - .../src/com/netscape/cmscore/dbs/CertRecord.java | 26 +-- .../com/netscape/cmscore/dbs/CertRecordList.java | 16 +- .../com/netscape/cmscore/dbs/CertRecordMapper.java | 25 +-- .../cmscore/dbs/CertificateRepository.java | 50 +++-- .../src/com/netscape/cmscore/dbs/DBRegistry.java | 25 ++- .../src/com/netscape/cmscore/dbs/DBSSession.java | 35 +++- .../src/com/netscape/cmscore/dbs/DBSUtil.java | 4 - .../com/netscape/cmscore/dbs/DBSearchResults.java | 15 +- .../src/com/netscape/cmscore/dbs/DBSubsystem.java | 52 ++++-- .../com/netscape/cmscore/dbs/DBVirtualList.java | 26 ++- .../com/netscape/cmscore/dbs/DateArrayMapper.java | 14 +- .../src/com/netscape/cmscore/dbs/DateMapper.java | 17 +- .../com/netscape/cmscore/dbs/IntegerMapper.java | 13 +- .../src/com/netscape/cmscore/dbs/KeyDBSchema.java | 7 - .../src/com/netscape/cmscore/dbs/KeyRecord.java | 25 +-- .../com/netscape/cmscore/dbs/KeyRecordList.java | 14 +- .../com/netscape/cmscore/dbs/KeyRecordMapper.java | 27 +-- .../com/netscape/cmscore/dbs/KeyRepository.java | 35 ++-- .../com/netscape/cmscore/dbs/KeyStateMapper.java | 16 +- .../netscape/cmscore/dbs/LdapFilterConverter.java | 9 +- .../src/com/netscape/cmscore/dbs/LongMapper.java | 14 +- .../com/netscape/cmscore/dbs/MetaInfoMapper.java | 16 +- .../netscape/cmscore/dbs/ObjectStreamMapper.java | 5 +- .../com/netscape/cmscore/dbs/PublicKeyMapper.java | 24 ++- .../netscape/cmscore/dbs/ReplicaIDRepository.java | 7 +- .../src/com/netscape/cmscore/dbs/Repository.java | 26 +-- .../com/netscape/cmscore/dbs/RepositoryRecord.java | 17 +- .../com/netscape/cmscore/dbs/RepositorySchema.java | 7 - .../com/netscape/cmscore/dbs/RevocationInfo.java | 17 +- .../netscape/cmscore/dbs/RevocationInfoMapper.java | 25 ++- .../src/com/netscape/cmscore/dbs/StringMapper.java | 14 +- .../netscape/cmscore/dbs/StringVectorMapper.java | 13 +- .../com/netscape/cmscore/dbs/X500NameMapper.java | 22 ++- .../netscape/cmscore/dbs/X509CertImplMapper.java | 32 ++-- .../cmscore/extensions/CMSExtensionsMap.java | 10 +- .../com/netscape/cmscore/extensions/KeyUsage.java | 22 +-- .../src/com/netscape/cmscore/jobs/CronItem.java | 9 +- .../src/com/netscape/cmscore/jobs/CronRange.java | 1 - .../src/com/netscape/cmscore/jobs/JobCron.java | 16 +- .../com/netscape/cmscore/jobs/JobsScheduler.java | 28 +-- .../netscape/cmscore/ldap/LdapAndExpression.java | 9 +- .../com/netscape/cmscore/ldap/LdapConnModule.java | 36 ++-- .../netscape/cmscore/ldap/LdapOrExpression.java | 8 +- .../netscape/cmscore/ldap/LdapPredicateParser.java | 17 +- .../netscape/cmscore/ldap/LdapPublishModule.java | 54 ++++-- .../netscape/cmscore/ldap/LdapRequestListener.java | 40 ++-- .../src/com/netscape/cmscore/ldap/LdapRule.java | 18 +- .../cmscore/ldap/LdapSimpleExpression.java | 16 +- .../com/netscape/cmscore/ldap/PublishObject.java | 10 +- .../netscape/cmscore/ldap/PublisherProcessor.java | 68 ++++--- .../cmscore/ldapconn/LdapAnonConnFactory.java | 16 +- .../cmscore/ldapconn/LdapAnonConnection.java | 6 +- .../netscape/cmscore/ldapconn/LdapAuthInfo.java | 16 +- .../cmscore/ldapconn/LdapBoundConnFactory.java | 16 +- .../cmscore/ldapconn/LdapBoundConnection.java | 15 +- .../netscape/cmscore/ldapconn/LdapConnInfo.java | 9 +- .../cmscore/ldapconn/LdapJssSSLSocketFactory.java | 20 +- .../netscape/cmscore/listeners/ListenerPlugin.java | 3 - .../cmscore/logging/AuditEventFactory.java | 10 +- .../com/netscape/cmscore/logging/AuditFormat.java | 2 +- .../src/com/netscape/cmscore/logging/LogQueue.java | 12 +- .../com/netscape/cmscore/logging/LogSubsystem.java | 17 +- .../src/com/netscape/cmscore/logging/Logger.java | 10 +- .../cmscore/logging/SignedAuditEventFactory.java | 10 +- .../cmscore/logging/SignedAuditLogger.java | 5 - .../cmscore/logging/SystemEventFactory.java | 10 +- .../cmscore/notification/EmailFormProcessor.java | 13 +- .../cmscore/notification/EmailResolverKeys.java | 8 +- .../cmscore/notification/EmailTemplate.java | 19 +- .../cmscore/notification/ReqCertEmailResolver.java | 20 +- .../notification/ReqCertSANameEmailResolver.java | 34 ++-- .../com/netscape/cmscore/policy/AndExpression.java | 4 +- .../netscape/cmscore/policy/GeneralNameUtil.java | 36 +++- .../cmscore/policy/GenericPolicyProcessor.java | 38 ++-- .../cmscore/policy/JavaScriptRequestProxy.java | 7 +- .../com/netscape/cmscore/policy/OrExpression.java | 4 +- .../cmscore/policy/PolicyPredicateParser.java | 14 +- .../src/com/netscape/cmscore/policy/PolicySet.java | 3 - .../netscape/cmscore/policy/SimpleExpression.java | 13 +- .../netscape/cmscore/profile/ProfileSubsystem.java | 21 ++- .../com/netscape/cmscore/registry/PluginInfo.java | 6 +- .../netscape/cmscore/registry/PluginRegistry.java | 16 +- .../netscape/cmscore/request/ARequestQueue.java | 57 ++++-- .../netscape/cmscore/request/ARequestRecord.java | 2 +- .../netscape/cmscore/request/ExtDataHashtable.java | 5 +- .../com/netscape/cmscore/request/RequestAttr.java | 6 +- .../com/netscape/cmscore/request/RequestQueue.java | 33 ++-- .../netscape/cmscore/request/RequestRecord.java | 37 ++-- .../cmscore/request/RequestRepository.java | 21 ++- .../netscape/cmscore/request/RequestSubsystem.java | 13 +- .../netscape/cmscore/security/CASigningCert.java | 32 ++-- .../netscape/cmscore/security/CertificateInfo.java | 54 ++++-- .../netscape/cmscore/security/JssSubsystem.java | 104 ++++++++--- .../com/netscape/cmscore/security/KeyCertUtil.java | 131 +++++++++---- .../netscape/cmscore/security/OCSPSigningCert.java | 34 ++-- .../src/com/netscape/cmscore/security/PWCBsdr.java | 15 +- .../src/com/netscape/cmscore/security/PWUtil.java | 6 +- .../com/netscape/cmscore/security/PWsdrCache.java | 33 ++-- .../netscape/cmscore/security/RASigningCert.java | 29 +-- .../src/com/netscape/cmscore/security/SSLCert.java | 29 +-- .../cmscore/security/SSLSelfSignedCert.java | 29 +-- .../netscape/cmscore/security/SubsystemCert.java | 29 +-- .../cmscore/selftests/SelfTestOrderedInstance.java | 2 +- .../cmscore/selftests/SelfTestSubsystem.java | 30 ++- .../netscape/cmscore/time/SimpleTimeSource.java | 5 +- .../cmscore/usrgrp/CertDNCertUserLocator.java | 19 +- .../cmscore/usrgrp/ExactMatchCertUserLocator.java | 19 +- .../src/com/netscape/cmscore/usrgrp/Group.java | 11 +- .../com/netscape/cmscore/usrgrp/UGSubsystem.java | 50 +++-- .../src/com/netscape/cmscore/usrgrp/User.java | 16 +- .../src/com/netscape/cmscore/util/Debug.java | 18 +- .../netscape/cmscore/util/ExceptionFormatter.java | 4 +- .../com/netscape/cmscore/util/FileAsString.java | 6 +- .../netscape/cmscore/util/FileDialogFilter.java | 3 +- .../src/com/netscape/cmscore/util/OsSubsystem.java | 26 ++- .../src/com/netscape/cmscore/util/PFXUtils.java | 31 ++-- .../netscape/cmscore/util/ProfileSubsystem.java | 27 ++- .../com/netscape/cmscore/util/StatsSubsystem.java | 19 +- .../src/com/netscape/cmscore/util/UtilMessage.java | 3 +- .../com/netscape/cmscore/util/UtilResources.java | 2 +- 171 files changed, 2151 insertions(+), 1455 deletions(-) (limited to 'pki/base/common/src/com/netscape/cmscore') diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index afaa5c9fc..a760f4fc1 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -18,94 +18,160 @@ package com.netscape.cmscore.apps; -import java.util.*; -import java.math.*; -import java.text.*; -import java.io.*; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.Vector; -import java.util.Date; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.math.BigInteger; +import java.security.NoSuchAlgorithmException; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.text.MessageFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.StringTokenizer; +import java.util.Timer; +import java.util.Vector; -import netscape.ldap.*; -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.security.extensions.CertInfo; +import netscape.security.pkcs.ContentInfo; +import netscape.security.pkcs.PKCS7; +import netscape.security.pkcs.SignerInfo; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; -import com.netscape.cms.servlet.csadmin.*; -import com.netscape.cmsutil.net.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.security.NoSuchAlgorithmException; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.password.*; +import org.apache.xerces.parsers.DOMParser; +import org.mozilla.jss.CryptoManager.CertificateUsage; +import org.mozilla.jss.util.PasswordCallback; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + +import com.netscape.certsrv.acls.ACL; +import com.netscape.certsrv.acls.ACLEntry; +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.apps.ICMSEngine; +import com.netscape.certsrv.apps.ICommandQueue; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.base.ICertPrettyPrint; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtPrettyPrint; +import com.netscape.certsrv.base.IPrettyPrintFormat; +import com.netscape.certsrv.base.ISecurityDomainSessionTable; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.profile.IEnrollProfile; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.connector.*; +import com.netscape.certsrv.base.ITimeSource; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; import com.netscape.certsrv.logging.ELogException; import com.netscape.certsrv.logging.ILogEvent; -import com.netscape.certsrv.logging.ILogQueue; import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogQueue; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.common.Constants; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; - +import com.netscape.certsrv.notification.IEmailFormProcessor; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.notification.IEmailTemplate; +import com.netscape.certsrv.notification.IMailNotification; +import com.netscape.certsrv.password.IPasswordCheck; +import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.ISubjAltNameConfig; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.servlet.csadmin.LDAPSecurityDomainSessionTable; +import com.netscape.cms.servlet.csadmin.SecurityDomainSessionTable; +import com.netscape.cms.servlet.csadmin.SessionTimer; +import com.netscape.cmscore.authentication.AuthSubsystem; +import com.netscape.cmscore.authentication.VerifiedCert; +import com.netscape.cmscore.authentication.VerifiedCerts; +import com.netscape.cmscore.authorization.AuthzSubsystem; +import com.netscape.cmscore.base.ArgBlock; +import com.netscape.cmscore.base.FileConfigStore; +import com.netscape.cmscore.base.SubsystemRegistry; import com.netscape.cmscore.cert.CertPrettyPrint; +import com.netscape.cmscore.cert.CertUtils; +import com.netscape.cmscore.cert.CrlCachePrettyPrint; import com.netscape.cmscore.cert.CrlPrettyPrint; import com.netscape.cmscore.cert.ExtPrettyPrint; -import com.netscape.cmscore.policy.*; -import com.netscape.cmscore.time.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.base.*; -import com.netscape.cmscore.util.Debug; -import com.netscape.cmscore.connector.*; -import com.netscape.cmscore.notification.*; -import com.netscape.cmscore.request.*; -import com.netscape.cmscore.cert.*; +import com.netscape.cmscore.cert.OidLoaderSubsystem; +import com.netscape.cmscore.cert.X500NameSubsystem; +import com.netscape.cmscore.connector.HttpConnection; +import com.netscape.cmscore.connector.HttpPKIMessage; +import com.netscape.cmscore.connector.HttpRequestEncoder; +import com.netscape.cmscore.connector.Resender; +import com.netscape.cmscore.dbs.CRLIssuingPointRecord; +import com.netscape.cmscore.dbs.CertificateRepository; +import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmscore.dbs.RepositoryRecord; +import com.netscape.cmscore.jobs.JobsScheduler; +import com.netscape.cmscore.ldapconn.LdapAnonConnFactory; +import com.netscape.cmscore.ldapconn.LdapAuthInfo; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapBoundConnection; +import com.netscape.cmscore.ldapconn.LdapConnInfo; +import com.netscape.cmscore.ldapconn.LdapJssSSLSocketFactory; import com.netscape.cmscore.logging.LogSubsystem; import com.netscape.cmscore.logging.Logger; import com.netscape.cmscore.logging.SignedAuditLogger; -import com.netscape.cmscore.util.OsSubsystem; +import com.netscape.cmscore.notification.EmailFormProcessor; +import com.netscape.cmscore.notification.EmailResolverKeys; +import com.netscape.cmscore.notification.EmailTemplate; +import com.netscape.cmscore.notification.ReqCertSANameEmailResolver; +import com.netscape.cmscore.policy.GeneralNameUtil; +import com.netscape.cmscore.registry.PluginRegistry; +import com.netscape.cmscore.request.CertRequestConstants; +import com.netscape.cmscore.request.RequestSubsystem; import com.netscape.cmscore.security.JssSubsystem; -import com.netscape.cmscore.dbs.DBSubsystem; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.authentication.*; -import com.netscape.cmscore.authorization.AuthzSubsystem; +import com.netscape.cmscore.security.PWCBsdr; +import com.netscape.cmscore.security.PWsdrCache; +import com.netscape.cmscore.time.SimpleTimeSource; import com.netscape.cmscore.usrgrp.UGSubsystem; -import com.netscape.cmscore.request.RequestSubsystem; -import com.netscape.cmscore.jobs.JobsScheduler; -import com.netscape.osutil.*; - -import com.netscape.cmscore.cert.OidLoaderSubsystem; -import com.netscape.cmscore.cert.X500NameSubsystem; - -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.CryptoManager.CertificateUsage; -import netscape.security.pkcs.*; -import com.netscape.cmscore.security.*; -import com.netscape.cmscore.registry.*; -import com.netscape.cmsutil.password.*; -import org.w3c.dom.*; -import org.apache.xerces.parsers.DOMParser; +import com.netscape.cmscore.util.Debug; +import com.netscape.cmscore.util.OsSubsystem; +import com.netscape.cmsutil.net.ISocketFactory; +import com.netscape.cmsutil.password.IPasswordStore; +import com.netscape.osutil.OSUtil; public class CMSEngine implements ICMSEngine { private static final String ID = "MAIN"; diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java b/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java index 638eae082..e9f1f77aa 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/CommandQueue.java @@ -19,9 +19,8 @@ package com.netscape.cmscore.apps; import java.util.Hashtable; -import java.util.Enumeration; -import java.util.TimeZone; -import com.netscape.certsrv.apps.*; + +import com.netscape.certsrv.apps.ICommandQueue; /*--------------------------------------------------------------- diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java b/pki/base/common/src/com/netscape/cmscore/apps/Setup.java index 21a39ec8f..3eb897cc4 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/Setup.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/Setup.java @@ -18,12 +18,8 @@ package com.netscape.cmscore.apps; -import java.io.File; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; import com.netscape.certsrv.base.EBaseException; -import netscape.ldap.*; -import java.io.*; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java index f04eb1869..b77c8a7da 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java @@ -18,16 +18,11 @@ package com.netscape.cmscore.apps; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.cmscore.util.*; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; -import org.mozilla.jss.util.ConsolePasswordCallback; import java.io.File; -import java.lang.*; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.cmscore.util.OsSubsystem; public final class Upgrade { diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java index b6cb0e6f7..d3793e344 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java @@ -18,13 +18,27 @@ package com.netscape.cmscore.authentication; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthManagerProxy; +import com.netscape.certsrv.authentication.AuthMgrPlugin; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EAuthMgrNotFound; +import com.netscape.certsrv.authentication.EAuthMgrPluginNotFound; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java index b9e0ede9d..c82142942 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java @@ -18,33 +18,25 @@ package com.netscape.cmscore.authentication; -import netscape.ldap.*; -import java.util.*; -import java.lang.Class; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.ra.*; -import com.netscape.cmscore.request.*; -import com.netscape.certsrv.kra.*; -import com.netscape.cmscore.usrgrp.*; - -import com.netscape.cmscore.util.*; +import java.security.cert.X509Certificate; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.cmscore.usrgrp.ExactMatchCertUserLocator; +import com.netscape.cmscore.usrgrp.User; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java index 518e89f53..bf698ddad 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java @@ -18,23 +18,37 @@ package com.netscape.cmscore.authentication; -import java.util.*; import java.math.BigInteger; -import java.security.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; - -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Vector; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthException; +import com.netscape.certsrv.authentication.EAuthUserError; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.cmscore.base.SubsystemRegistry; +import com.netscape.cmscore.dbs.CertRecord; +import com.netscape.cmscore.dbs.CertificateRepository; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java index b2914686e..e9bcbcb6b 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/NullAuthentication.java @@ -18,13 +18,16 @@ package com.netscape.cmscore.authentication; -import java.util.*; -import java.lang.Class; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java index 1c675b8ae..88dc72969 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/PasswdUserDBAuthentication.java @@ -18,24 +18,30 @@ package com.netscape.cmscore.authentication; -import netscape.ldap.*; +import netscape.ldap.LDAPConnection; import netscape.ldap.LDAPEntry; -import java.util.*; -import java.lang.Class; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.ldap.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.usrgrp.*; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cmscore.dbs.DBSubsystem; +import com.netscape.cmscore.ldapconn.LdapAnonConnFactory; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapConnInfo; +import com.netscape.cmscore.usrgrp.UGSubsystem; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java index 7aca9ae54..569275376 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java @@ -21,26 +21,31 @@ package com.netscape.cmscore.authentication; // ldap java sdk // cert server imports. -import com.netscape.certsrv.base.IConfigStore; +import java.math.BigInteger; +import java.security.Principal; +import java.security.cert.X509Certificate; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.EAuthUserError; +import com.netscape.certsrv.authentication.EInvalidCredentials; +import com.netscape.certsrv.authentication.EMissingCredential; +import com.netscape.certsrv.authentication.IAuthCredentials; +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; - import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; - -// cert server x509 imports -import netscape.security.x509.*; - -import java.security.*; -import java.security.cert.*; - -// java sdk imports. -import java.math.*; - -import com.netscape.cmscore.util.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java b/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java index 90963e324..69192f3f0 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCert.java @@ -18,10 +18,10 @@ package com.netscape.cmscore.authentication; -import java.util.*; import java.math.BigInteger; +import java.util.Date; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java b/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java index 9ceae4487..ca0f63e55 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/VerifiedCerts.java @@ -18,9 +18,9 @@ package com.netscape.cmscore.authentication; -import java.util.*; import java.math.BigInteger; -import netscape.security.x509.*; + +import netscape.security.x509.X509CertImpl; /** diff --git a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java index 9dd1ef57d..db1f593cd 100644 --- a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java @@ -18,14 +18,25 @@ package com.netscape.cmscore.authorization; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authorization.AuthzManagerProxy; +import com.netscape.certsrv.authorization.AuthzMgrPlugin; +import com.netscape.certsrv.authorization.AuthzToken; +import com.netscape.certsrv.authorization.EAuthzException; +import com.netscape.certsrv.authorization.EAuthzMgrNotFound; +import com.netscape.certsrv.authorization.EAuthzMgrPluginNotFound; +import com.netscape.certsrv.authorization.IAuthzManager; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java b/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java index 2e0d19201..01519ccda 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java +++ b/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java @@ -18,13 +18,21 @@ package com.netscape.cmscore.base; -import java.util.*; -import java.io.*; -import netscape.security.pkcs.*; -import java.security.*; +import java.io.IOException; import java.math.BigInteger; -import com.netscape.certsrv.base.*; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.SignatureException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import netscape.security.pkcs.PKCS10; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.KeyGenInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java index 79bb60c67..95e3ba674 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java +++ b/pki/base/common/src/com/netscape/cmscore/base/FileConfigStore.java @@ -18,10 +18,19 @@ package com.netscape.cmscore.base; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.Enumeration; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.cmsutil.util.Utils; diff --git a/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java b/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java index 93d88a550..2a7a1ef23 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java +++ b/pki/base/common/src/com/netscape/cmscore/base/JDialogPasswordCallback.java @@ -18,15 +18,31 @@ package com.netscape.cmscore.base; -import javax.swing.*; -import java.awt.*; -import java.awt.event.*; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.event.WindowListener; + +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JPasswordField; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; import org.mozilla.jss.util.PasswordCallbackInfo; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.CryptoToken; -import javax.swing.border.EmptyBorder; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java index f8dd97aa5..8eb6a829c 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java +++ b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java @@ -18,12 +18,25 @@ package com.netscape.cmscore.base; -import java.io.*; -import java.util.*; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + import org.mozilla.jss.util.Base64OutputStream; -import com.netscape.certsrv.base.*; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotDefined; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISourceConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java b/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java index e2584accf..98970df01 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SimpleProperties.java @@ -18,18 +18,17 @@ package com.netscape.cmscore.base; -import com.netscape.certsrv.base.*; -import java.util.Date; -import java.util.Enumeration; +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.IOException; -import java.io.PrintStream; -import java.io.PrintWriter; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.BufferedReader; import java.io.OutputStream; import java.io.OutputStreamWriter; -import java.io.BufferedWriter; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.util.Date; +import java.util.Enumeration; import java.util.Hashtable; diff --git a/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java index 9b192905f..25860cb02 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SourceConfigStore.java @@ -18,7 +18,7 @@ package com.netscape.cmscore.base; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.ISourceConfigStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java b/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java index 442a93671..83c74ebc1 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java @@ -18,9 +18,12 @@ package com.netscape.cmscore.base; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; -import java.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java b/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java index f95a61610..fdae65a5b 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SubsystemRegistry.java @@ -19,7 +19,8 @@ package com.netscape.cmscore.base; import java.util.Hashtable; -import com.netscape.certsrv.base.*; + +import com.netscape.certsrv.base.ISubsystem; public class SubsystemRegistry extends Hashtable { diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java index 9b6c3dfe0..ed20d76f3 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java @@ -18,8 +18,10 @@ package com.netscape.cmscore.cert; -import java.util.*; -import netscape.security.x509.*; +import java.util.Comparator; +import java.util.Date; + +import netscape.security.x509.X509CertImpl; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java index 882a38c0c..3168b92f2 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java @@ -18,15 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.PublicKey; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; +import java.security.cert.Certificate; + +import com.netscape.certsrv.base.ICertPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java index 6731ae35d..5a49d06e8 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java @@ -18,28 +18,51 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.math.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.osutil.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.logging.ILogger; - +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import netscape.security.pkcs.*; -import java.net.SocketException; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Date; +import java.util.StringTokenizer; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS7; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateIssuerName; +import netscape.security.x509.CertificateSerialNumber; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; -import javax.servlet.http.HttpServletRequest; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.CryptoManager.CertificateUsage; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.osutil.OSUtil; + /** * Utility class with assorted methods to check for * smime pairs, determining the type of cert - signature diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java index 979e0fdd8..effd86edd 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java @@ -18,12 +18,20 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.security.cert.*; -import org.mozilla.jss.asn1.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; +import java.io.IOException; +import java.io.OutputStream; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.cert.ICrossCertPairSubsystem; diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java index 693d881c5..232035250 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java @@ -18,15 +18,21 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; +import java.text.DateFormat; +import java.util.Iterator; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.TimeZone; -import com.netscape.certsrv.apps.*; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.RevokedCertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; /** * This class will display the certificate content in predefined diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java index 2f7c08dee..1a3969b4e 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java @@ -18,15 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.util.*; -import java.security.*; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.base.ICRLPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java index 41020abd1..663585bf0 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java @@ -18,22 +18,34 @@ package com.netscape.cmscore.cert; -import netscape.ldap.*; -import java.awt.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.cert.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.ldapconn.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; +import java.util.Enumeration; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPModificationSet; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.cert.ICrossCertPairSubsystem; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.publish.IXcertPublisherProcessor; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java index 09aea0aca..ea9fabf24 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java @@ -18,17 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.math.BigInteger; -import netscape.security.util.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; -import java.security.*; -import netscape.security.x509.CRLDistributionPointsExtension.Reason; +import netscape.security.x509.Extension; + +import com.netscape.certsrv.base.IExtPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java index 7fd33f95f..b340ea236 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java @@ -18,15 +18,25 @@ package com.netscape.cmscore.cert; -import java.awt.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.ObjectIdentifier; import java.security.cert.CertificateException; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; + +import netscape.security.extensions.CertificateRenewalWindowExtension; +import netscape.security.extensions.CertificateScopeOfUseExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.HoldInstructionExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.IssuingDistributionPointExtension; +import netscape.security.x509.OIDMap; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java index 550756f31..3ace3c67b 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java @@ -18,10 +18,7 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.IPrettyPrintFormat; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java index 026dbfcbc..4bf1147ac 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java @@ -18,9 +18,10 @@ package com.netscape.cmscore.cert; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; +import java.util.ListResourceBundle; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.KeyUsageExtension; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java index 1f2d16136..01e58fa15 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java @@ -18,15 +18,7 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.provider.RSAPublicKey; -import com.netscape.cmscore.util.*; -import java.security.*; +import java.security.PublicKey; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java index 0efc09d33..539ec82b0 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java @@ -18,15 +18,22 @@ package com.netscape.cmscore.cert; -import java.awt.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVAValueConverter; +import netscape.security.x509.DirStrConverter; +import netscape.security.x509.X500NameAttrMap; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java index 208fc5e7f..5a607ee9d 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java @@ -18,17 +18,15 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.connector.*; -import com.netscape.cmscore.connector.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import com.netscape.certsrv.authority.*; -import java.util.*; -import java.io.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.net.ISocketFactory; /** diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java index 7db508fb6..e8b03542e 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java @@ -18,16 +18,20 @@ package com.netscape.cmscore.connector; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; +import java.io.IOException; +import java.util.StringTokenizer; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IRequestEncoder; import com.netscape.cmscore.util.Debug; -import com.netscape.certsrv.apps.*; -import java.io.*; -import java.util.*; +import com.netscape.cmsutil.http.HttpClient; +import com.netscape.cmsutil.http.HttpRequest; +import com.netscape.cmsutil.http.HttpResponse; +import com.netscape.cmsutil.net.ISocketFactory; public class HttpConnection implements IHttpConnection { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java index 4ce3ed848..fefbe0f31 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java @@ -18,15 +18,23 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import java.util.*; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.connector.IHttpConnection; +import com.netscape.certsrv.connector.IHttpPKIMessage; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cmsutil.http.JssSSLSocketFactory; +import com.netscape.cmsutil.net.ISocketFactory; public class HttpConnector implements IConnector { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java index b9e32cbd9..6e29f7efc 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java @@ -18,12 +18,19 @@ package com.netscape.cmscore.connector; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.OptionalDataException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.NoSuchElementException; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.connector.IHttpPKIMessage; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.apps.*; import com.netscape.cmscore.util.Debug; -import java.util.*; -import java.io.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java index 50b09fd2a..4a762dd8b 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java @@ -18,11 +18,15 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.connector.*; -import com.netscape.cmscore.util.Debug; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OptionalDataException; -import java.io.*; +import com.netscape.certsrv.connector.IRequestEncoder; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java index efc97c435..9272cc93f 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java @@ -18,14 +18,23 @@ package com.netscape.cmscore.connector; -import java.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Hashtable; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cmscore.util.Debug; public class LocalConnector implements IConnector { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java b/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java index 6a9703b69..ddd02f82b 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/RemoteAuthority.java @@ -18,8 +18,9 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.connector.IRemoteAuthority; public class RemoteAuthority implements IRemoteAuthority { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java b/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java index 825f4d564..b00950209 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/RequestTransfer.java @@ -18,11 +18,11 @@ package com.netscape.cmscore.connector; -import java.util.*; - -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Vector; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.request.IRequest; import com.netscape.cmscore.authentication.ChallengePhraseAuthentication; diff --git a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java b/pki/base/common/src/com/netscape/cmscore/connector/Resender.java index 78fddaf5c..ad89a34a1 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/Resender.java @@ -18,19 +18,23 @@ package com.netscape.cmscore.connector; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmscore.util.Debug; -import com.netscape.cmsutil.http.*; - -import java.util.Vector; +import java.io.IOException; import java.util.Enumeration; -import java.io.*; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IRemoteAuthority; +import com.netscape.certsrv.connector.IResender; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cmscore.util.Debug; +import com.netscape.cmsutil.http.JssSSLSocketFactory; /** diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java b/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java index fbb652282..e2bee6d14 100644 --- a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java +++ b/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java @@ -18,19 +18,21 @@ package com.netscape.cmscore.crmf; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.primitive.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Vector; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.pkix.crmf.CertReqMsg; +import org.mozilla.jss.pkix.crmf.CertRequest; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; import org.mozilla.jss.pkix.primitive.AVA; -import org.mozilla.jss.pkcs11.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.apps.*; +import com.netscape.certsrv.apps.CMS; public class CRMFParser { diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java b/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java index 04529be69..d7899da3d 100644 --- a/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java +++ b/pki/base/common/src/com/netscape/cmscore/crmf/PKIArchiveOptionsContainer.java @@ -18,7 +18,7 @@ package com.netscape.cmscore.crmf; -import org.mozilla.jss.pkix.crmf.*; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; public class PKIArchiveOptionsContainer { diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java index c0afbe742..8d6c325fa 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java @@ -18,11 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java index fcb806bb5..b8e5b73dd 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/ByteArrayMapper.java @@ -18,11 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java index ad065f924..58342a557 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CRLDBSchema.java @@ -18,13 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java index 8d7f19ca6..e1c07d302 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CRLIssuingPointRecord.java @@ -18,18 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import java.io.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.crldb.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java index c2eba5acb..ba3ed5a7f 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java @@ -18,22 +18,22 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.util.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; - -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; - -import com.netscape.certsrv.apps.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.crldb.ICRLRepository; /** * A class represents a CRL repository. It stores all the diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java index c444a45ac..83164aab5 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertDBSchema.java @@ -18,13 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java index 308d801e3..877179947 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecord.java @@ -18,17 +18,21 @@ package com.netscape.cmscore.dbs; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.apps.*; +import java.math.BigInteger; +import java.security.cert.Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java index 18b8c1bf5..e8d7df9c8 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordList.java @@ -18,15 +18,13 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; - -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.IElementProcessor; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java index 6b910ebbb..510da3c54 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertRecordMapper.java @@ -18,18 +18,21 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.Debug; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java index df5fe2cf0..740948712 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java @@ -19,25 +19,41 @@ package com.netscape.cmscore.dbs; import java.math.BigInteger; -import java.util.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; import java.security.cert.Certificate; -import netscape.security.x509.*; -import netscape.ldap.*; +import java.util.Arrays; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; - -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.cert.*; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertRecordList; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; +import com.netscape.certsrv.dbs.repository.IRepository; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java index 660e385fe..adbae506c 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBRegistry.java @@ -18,12 +18,25 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBDynAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IFilterConverter; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java index 03c86a219..efdbceec7 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java @@ -18,13 +18,34 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import netscape.ldap.controls.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPModificationSet; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.ldap.controls.LDAPPersistSearchControl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.EDBNotAvailException; +import com.netscape.certsrv.dbs.EDBRecordNotFoundException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java index 475a77dcb..123fb8478 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSUtil.java @@ -18,10 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java index b7f6cd616..c515b3305 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSearchResults.java @@ -18,12 +18,15 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; + +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java index 797dd8324..1c437896d 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java @@ -18,24 +18,40 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import netscape.ldap.*; -import netscape.ldap.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.base.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.cert.*; +import java.math.BigInteger; +import java.util.Hashtable; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSchema; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPObjectClassSchema; +import netscape.ldap.LDAPSchema; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv3; +import netscape.security.x509.CertificateValidity; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.EDBNotAvailException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.base.PropConfigStore; +import com.netscape.cmscore.ldapconn.LdapAuthInfo; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapConnInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java index 8a3b3cba7..e5fc8c7bb 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java @@ -18,13 +18,25 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import netscape.ldap.controls.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Arrays; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPControl; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPSortKey; +import netscape.ldap.controls.LDAPSortControl; +import netscape.ldap.controls.LDAPVirtualListControl; +import netscape.ldap.controls.LDAPVirtualListResponse; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.IElementProcessor; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java index e073fe633..b8df1240c 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DateArrayMapper.java @@ -18,10 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java index 8b0009479..d547a4459 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DateMapper.java @@ -18,11 +18,18 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.text.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java index 2293bea26..c5601a9bf 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/IntegerMapper.java @@ -18,10 +18,15 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java index 7a5e02a04..ff7764247 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyDBSchema.java @@ -18,13 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java index 7b6fcdb8d..316c67381 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecord.java @@ -18,21 +18,16 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -//import netscape.security.provider.*; -import netscape.security.x509.*; -import netscape.security.pkcs.*; -import netscape.ldap.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.keydb.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.KeyState; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java index 250e66e6c..a3a3a98c0 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordList.java @@ -18,13 +18,13 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.cmscore.dbs.*; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRecordList; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java index eaaf3779f..1cbd3229d 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRecordMapper.java @@ -18,18 +18,21 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java index cc4298993..6d4e4688d 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java @@ -18,20 +18,27 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.dbs.*; +import java.math.BigInteger; +import java.security.PublicKey; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.keydb.IKeyRecord; +import com.netscape.certsrv.dbs.keydb.IKeyRecordList; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java index 0630efa7c..7f13c8ed2 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyStateMapper.java @@ -18,12 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.keydb.KeyState; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java b/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java index db5db02c9..909bf47e1 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/LdapFilterConverter.java @@ -18,9 +18,12 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Hashtable; + +import com.netscape.certsrv.base.AttributeNameHelper; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IFilterConverter; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java index 9006081f5..cdd9aeb77 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/LongMapper.java @@ -18,11 +18,15 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java index c3248ec12..605e2fadf 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/MetaInfoMapper.java @@ -18,11 +18,17 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java index 5c02b4014..cb5e4cb68 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/ObjectStreamMapper.java @@ -25,7 +25,10 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.Enumeration; import java.util.Vector; -import netscape.ldap.*; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.EDBException; diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java index 4d93f843a..f55248eec 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/PublicKeyMapper.java @@ -18,16 +18,20 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.cert.*; +import java.security.PublicKey; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.cert.CertUtils; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java index ddf292b12..61beb4236 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java @@ -20,10 +20,11 @@ package com.netscape.cmscore.dbs; import java.math.BigInteger; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.replicadb.*; -import com.netscape.certsrv.base.*; import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; /** * A class represents a replica repository. It diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java b/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java index df84b1156..858e7a639 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java @@ -18,18 +18,22 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.math.BigInteger; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.replicadb.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.dbs.repository.IRepository; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; /** * A class represents a generic repository. It maintains unique diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java b/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java index 7aa63fa1d..7148eb1e1 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/RepositoryRecord.java @@ -18,16 +18,13 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.repository.*; +import java.math.BigInteger; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java b/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java index 436c8633e..67cc5c1cd 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/RepositorySchema.java @@ -18,13 +18,6 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java index 81ae72053..c55685692 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfo.java @@ -18,18 +18,13 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.io.Serializable; +import java.util.Date; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; + +import com.netscape.certsrv.dbs.certdb.IRevocationInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java index 6ee2c7bb2..fc0eb3866 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/RevocationInfoMapper.java @@ -18,16 +18,23 @@ package com.netscape.cmscore.dbs; -import java.math.*; -import java.io.*; -import java.util.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.CRLReasonExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.RevocationReason; + import com.netscape.certsrv.apps.CMS; -import com.netscape.cmscore.dbs.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java index e9fbd64e7..39fdac87e 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/StringMapper.java @@ -18,10 +18,16 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.NoSuchElementException; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java index 2ec203eb6..d14470a2b 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/StringVectorMapper.java @@ -18,10 +18,15 @@ package com.netscape.cmscore.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java index b7e386f77..963c2fdc9 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/X500NameMapper.java @@ -18,14 +18,20 @@ package com.netscape.cmscore.dbs; -import java.io.*; -import java.util.*; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.io.IOException; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java index 29e1db849..e1aa144b9 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/X509CertImplMapper.java @@ -18,20 +18,30 @@ package com.netscape.cmscore.dbs; -import java.io.*; -import java.util.*; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Set; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.Extension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + import com.netscape.certsrv.apps.CMS; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.util.Debug; +import com.netscape.certsrv.base.AttributeNameHelper; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.certdb.ICertRecord; /** diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java index aceb6f1bf..a5eb391d8 100644 --- a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java +++ b/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java @@ -18,17 +18,17 @@ package com.netscape.cmscore.extensions; -import java.util.Hashtable; import java.util.Enumeration; +import java.util.Hashtable; -import netscape.security.x509.Extension; import netscape.security.util.ObjectIdentifier; -import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.extensions.*; +import com.netscape.certsrv.extensions.EExtensionsException; +import com.netscape.certsrv.extensions.ICMSExtension; /** diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java index db618f6f0..a5378ced3 100644 --- a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java +++ b/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java @@ -20,21 +20,21 @@ package com.netscape.cmscore.extensions; import java.io.IOException; +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.PKIXExtensions; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.extensions.EExtensionsException; +import com.netscape.certsrv.extensions.ICMSExtension; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.extensions.*; - -import netscape.security.x509.Extension; -import netscape.security.x509.PKIXExtensions; -import netscape.security.x509.KeyUsageExtension; -import netscape.security.util.ObjectIdentifier; -import netscape.security.util.DerOutputStream; - -import com.netscape.cmscore.util.*; +import com.netscape.cmscore.util.Debug; public class KeyUsage implements ICMSExtension { diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java index b97168163..fda9069b3 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java @@ -18,11 +18,12 @@ package com.netscape.cmscore.jobs; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; +import java.util.StringTokenizer; +import java.util.Vector; -import java.util.*; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java b/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java index e8923eef8..59293ee1b 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/CronRange.java @@ -18,7 +18,6 @@ package com.netscape.cmscore.jobs; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java index a52f37526..13ef7f256 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java @@ -18,13 +18,15 @@ package com.netscape.cmscore.jobs; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.apps.*; - -import java.util.*; -import java.lang.*; +import java.util.Calendar; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java index feddc69ad..a37fcf93d 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java @@ -18,18 +18,22 @@ package com.netscape.cmscore.jobs; -import java.util.*; -import java.io.*; -import java.lang.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import netscape.security.x509.*; +import java.util.Calendar; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.jobs.EJobsException; +import com.netscape.certsrv.jobs.IJob; +import com.netscape.certsrv.jobs.IJobCron; +import com.netscape.certsrv.jobs.IJobsScheduler; +import com.netscape.certsrv.jobs.JobPlugin; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java index 598ae198b..c41f361ef 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapAndExpression.java @@ -18,11 +18,10 @@ package com.netscape.cmscore.ldap; -import com.netscape.certsrv.base.IAttrSet; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java index 273a21c96..7574bf1b3 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapConnModule.java @@ -18,27 +18,21 @@ package com.netscape.cmscore.ldap; -import java.util.Hashtable; -import java.util.Enumeration; -import java.math.BigInteger; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import java.security.*; -import java.security.cert.*; -import java.io.IOException; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; - -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.util.Debug; +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapBoundConnFactory; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnInfo; +import com.netscape.certsrv.ldap.ILdapConnModule; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.ldapconn.LdapAuthInfo; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.ldapconn.LdapConnInfo; public class LdapConnModule implements ILdapConnModule { diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java index ae0e1a310..aaf9f35de 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapOrExpression.java @@ -18,10 +18,10 @@ package com.netscape.cmscore.ldap; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index b8e62d896..c3abbdd5a 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -18,13 +18,16 @@ package com.netscape.cmscore.ldap; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java index 0afd0ed43..8e890f06b 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPublishModule.java @@ -18,29 +18,43 @@ package com.netscape.cmscore.ldap; -import java.util.Hashtable; -import java.util.Enumeration; +import java.io.IOException; import java.math.BigInteger; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Hashtable; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; +import netscape.ldap.LDAPConnection; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapCrlMapper; +import com.netscape.certsrv.publish.ILdapMapper; +import com.netscape.certsrv.publish.ILdapPlugin; +import com.netscape.certsrv.publish.ILdapPublishModule; +import com.netscape.certsrv.publish.ILdapPublisher; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.cmscore.dbs.CertRecord; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; import com.netscape.cmscore.util.Debug; -import com.netscape.certsrv.ldap.*; -import com.netscape.cmscore.ldapconn.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.authority.*; -import java.security.*; -import java.security.cert.*; -import java.io.IOException; -import netscape.ldap.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.certsrv.apps.*; public class LdapPublishModule implements ILdapPublishModule { diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java index d467bd957..6c1e1e8ad 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java @@ -18,25 +18,29 @@ package com.netscape.cmscore.ldap; +import java.math.BigInteger; +import java.security.cert.Certificate; import java.util.Hashtable; -import java.util.Enumeration; -import java.math.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.publish.*; -import java.security.cert.*; -import java.io.IOException; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ca.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmscore.util.*; + +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.RequestId; +import com.netscape.cmscore.dbs.CertRecord; public class LdapRequestListener implements IRequestListener { diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java index d3872740e..16bc7f02b 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java @@ -18,13 +18,17 @@ package com.netscape.cmscore.ldap; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Locale; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.publish.ILdapRule; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java index d3646c7b8..a2a7e5583 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapSimpleExpression.java @@ -18,13 +18,15 @@ package com.netscape.cmscore.ldap; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cmscore.util.AssertionException; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java b/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java index 6818a48bf..fc2ace23c 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublishObject.java @@ -18,14 +18,8 @@ package com.netscape.cmscore.ldap; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.ldap.*; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index 488524e9d..a1e45a58a 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -18,35 +18,47 @@ package com.netscape.cmscore.ldap; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; -import java.security.*; +import java.math.BigInteger; +import java.security.cert.X509CRL; import java.security.cert.X509Certificate; -import javax.servlet.*; -import javax.servlet.http.*; -import java.security.cert.*; -import netscape.ldap.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; - -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.dbs.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.ICertAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.certdb.ICertRecord; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnModule; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.ILdapExpression; +import com.netscape.certsrv.publish.ILdapMapper; +import com.netscape.certsrv.publish.ILdapPublisher; +import com.netscape.certsrv.publish.ILdapRule; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.publish.IXcertPublisherProcessor; +import com.netscape.certsrv.publish.LdapCertMapResult; +import com.netscape.certsrv.publish.MapperPlugin; +import com.netscape.certsrv.publish.MapperProxy; +import com.netscape.certsrv.publish.PublisherPlugin; +import com.netscape.certsrv.publish.PublisherProxy; +import com.netscape.certsrv.publish.RulePlugin; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestNotifier; +import com.netscape.cmscore.dbs.CertRecord; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java index fbc99608a..61323aad8 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java @@ -18,11 +18,17 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSocketFactory; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java index 4be6bc33b..ba6707fb9 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnection.java @@ -18,8 +18,10 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import com.netscape.certsrv.ldap.*; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSocketFactory; +import netscape.ldap.LDAPv2; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java index 667e68a85..b499dd07e 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAuthInfo.java @@ -19,17 +19,15 @@ package com.netscape.cmscore.ldapconn; import java.util.Hashtable; + import netscape.ldap.LDAPConnection; import netscape.ldap.LDAPException; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; -import org.mozilla.jss.util.ConsolePasswordCallback; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.cmscore.base.*; -import com.netscape.cmsutil.password.*; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.cmsutil.password.IPasswordStore; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java index 31e3dca1c..e5322d274 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java @@ -18,11 +18,17 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSocketFactory; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ELdapServerDownException; +import com.netscape.certsrv.ldap.ILdapBoundConnFactory; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java index 8a6b98fc3..b7973e8ce 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnection.java @@ -18,11 +18,16 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import java.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; +import java.util.Properties; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPRebind; +import netscape.ldap.LDAPRebindAuth; +import netscape.ldap.LDAPSocketFactory; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java index ba037d854..70361f87f 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapConnInfo.java @@ -18,11 +18,14 @@ package com.netscape.cmscore.ldapconn; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import netscape.ldap.LDAPv2; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java index b9f7d78eb..1b9898840 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java @@ -18,13 +18,19 @@ package com.netscape.cmscore.ldapconn; -import java.net.*; -import java.io.*; -import netscape.ldap.*; -import org.mozilla.jss.ssl.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ldap.*; +import java.io.IOException; +import java.net.Socket; +import java.net.UnknownHostException; + +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; + +import org.mozilla.jss.ssl.SSLHandshakeCompletedEvent; +import org.mozilla.jss.ssl.SSLHandshakeCompletedListener; +import org.mozilla.jss.ssl.SSLSocket; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java b/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java index a7961e207..181ea34b0 100644 --- a/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java +++ b/pki/base/common/src/com/netscape/cmscore/listeners/ListenerPlugin.java @@ -18,9 +18,6 @@ package com.netscape.cmscore.listeners; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java b/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java index e8c7032d1..46b42f047 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/AuditEventFactory.java @@ -18,9 +18,13 @@ package com.netscape.cmscore.logging; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Properties; + +import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.IBundleLogEvent; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventFactory; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java b/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java index 0af38f168..7d7f817f8 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java @@ -18,7 +18,7 @@ package com.netscape.cmscore.logging; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java index 24336d308..faddc44d2 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java @@ -18,12 +18,12 @@ package com.netscape.cmscore.logging; -import java.io.*; -import java.util.*; -import java.text.MessageFormat; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.CMS; +import java.util.Vector; + +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogQueue; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java index 9a9d4bd4f..0f1f93042 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java @@ -18,12 +18,19 @@ package com.netscape.cmscore.logging; -import java.io.*; -import java.util.*; -import java.text.MessageFormat; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogQueue; +import com.netscape.certsrv.logging.ILogSubsystem; +import com.netscape.certsrv.logging.LogPlugin; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/logging/Logger.java b/pki/base/common/src/com/netscape/cmscore/logging/Logger.java index b15717ca4..3c97023a1 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/Logger.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/Logger.java @@ -18,11 +18,13 @@ package com.netscape.cmscore.logging; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.logging.*; +import java.util.Hashtable; +import java.util.Properties; -import com.netscape.cmscore.util.*; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventFactory; +import com.netscape.certsrv.logging.ILogQueue; +import com.netscape.certsrv.logging.ILogger; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java b/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java index 5faa0baba..970516c1e 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditEventFactory.java @@ -18,9 +18,13 @@ package com.netscape.cmscore.logging; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Properties; + +import com.netscape.certsrv.logging.IBundleLogEvent; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java b/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java index 0bb99fb5b..013447cef 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/SignedAuditLogger.java @@ -18,11 +18,6 @@ package com.netscape.cmscore.logging; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.logging.*; - -import com.netscape.cmscore.util.*; /** diff --git a/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java b/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java index 4e5131311..7bef282b3 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/SystemEventFactory.java @@ -18,9 +18,13 @@ package com.netscape.cmscore.logging; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Properties; + +import com.netscape.certsrv.logging.IBundleLogEvent; +import com.netscape.certsrv.logging.ILogEvent; +import com.netscape.certsrv.logging.ILogEventFactory; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SystemEvent; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java index b04186c3a..aa1fd15f2 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java @@ -18,11 +18,14 @@ package com.netscape.cmscore.notification; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.notification.*; -import java.util.*; -import java.lang.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailFormProcessor; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java b/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java index 5f053c297..17febae1c 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/EmailResolverKeys.java @@ -18,9 +18,11 @@ package com.netscape.cmscore.notification; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.notification.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.notification.IEmailResolverKeys; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java index 483426414..5c9e9ae0a 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java @@ -18,16 +18,15 @@ package com.netscape.cmscore.notification; -import java.lang.*; -import java.io.*; -import java.util.*; -import javax.servlet.*; -import javax.servlet.http.*; - -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.IEmailTemplate; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java index 28f0e364c..04dd9b5f8 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertEmailResolver.java @@ -18,16 +18,18 @@ package com.netscape.cmscore.notification; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.apps.*; -import java.security.*; -import java.security.cert.*; import java.io.IOException; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; +import java.security.cert.X509Certificate; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java index 440e62e85..b592ea168 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/ReqCertSANameEmailResolver.java @@ -18,19 +18,31 @@ package com.netscape.cmscore.notification; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.notification.*; -import java.util.Enumeration; -import java.security.*; -import java.security.cert.*; import java.io.IOException; -import netscape.security.x509.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ca.*; +import java.security.cert.CertificateException; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; + +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.notification.ENotificationException; +import com.netscape.certsrv.notification.IEmailResolver; +import com.netscape.certsrv.notification.IEmailResolverKeys; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java index fb3134ffa..d58cfe132 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java @@ -18,8 +18,8 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java index 7a8ab4342..8f16548db 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java @@ -18,16 +18,36 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.io.*; -import java.util.Vector; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.DNSName; +import netscape.security.x509.EDIPartyName; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.IPAddressName; +import netscape.security.x509.InvalidIPAddressException; +import netscape.security.x509.OIDName; +import netscape.security.x509.RFC822Name; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNameConfig; +import com.netscape.certsrv.policy.IGeneralNameUtil; +import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.ISubjAltNameConfig; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java index 63b28d995..95d668283 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java @@ -18,21 +18,35 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.text.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.certsrv.policy.IKeyArchivalPolicy; +import com.netscape.certsrv.policy.IKeyRecoveryPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.policy.IPolicySet; +import com.netscape.certsrv.policy.IRenewalPolicy; +import com.netscape.certsrv.policy.IRevocationPolicy; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IPolicy; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.cmscore.util.*; +import com.netscape.cmscore.base.PropConfigStore; +import com.netscape.cmscore.base.SubsystemRegistry; import com.netscape.cmscore.request.ARequestQueue; +import com.netscape.cmscore.util.AssertionException; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java index 3f421fca4..fde12d04f 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java @@ -18,10 +18,9 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.cmscore.util.Debug; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; public class JavaScriptRequestProxy { diff --git a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java index dfbcb0ef6..f1bb6457a 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java @@ -18,8 +18,8 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index 46a874291..a7f6f2218 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -18,12 +18,16 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java index 6ec1fa5c2..17a19e9d4 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java @@ -21,9 +21,6 @@ package com.netscape.cmscore.policy; import java.util.Enumeration; import java.util.Vector; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.policy.IExpression; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java index 7b771442c..5e6458be2 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java @@ -18,12 +18,15 @@ package com.netscape.cmscore.policy; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.request.IRequest; +import java.util.Enumeration; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cmscore.util.AssertionException; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java index 25635e901..3af3321d1 100644 --- a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java @@ -18,12 +18,21 @@ package com.netscape.cmscore.profile; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.registry.*; -import com.netscape.certsrv.profile.*; +import java.io.File; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.registry.IPluginInfo; +import com.netscape.certsrv.registry.IPluginRegistry; public class ProfileSubsystem implements IProfileSubsystem { diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java b/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java index d0ed9324e..2766bcdbb 100644 --- a/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/registry/PluginInfo.java @@ -18,9 +18,9 @@ package com.netscape.cmscore.registry; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.registry.*; +import java.util.Locale; + +import com.netscape.certsrv.registry.IPluginInfo; /** diff --git a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java b/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java index a424d8b73..cde61d665 100644 --- a/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java +++ b/pki/base/common/src/com/netscape/cmscore/registry/PluginRegistry.java @@ -18,10 +18,18 @@ package com.netscape.cmscore.registry; -import java.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.registry.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.registry.ERegistryException; +import com.netscape.certsrv.registry.IPluginInfo; +import com.netscape.certsrv.registry.IPluginRegistry; public class PluginRegistry implements IPluginRegistry { diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java index 8b06fffbe..97a2e44ea 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java @@ -18,32 +18,49 @@ package com.netscape.cmscore.request; -import java.util.*; -import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateException; -import java.security.cert.CRLException; -import java.math.BigInteger; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.ByteArrayInputStream; - -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.base.IAttrSet; - -import com.netscape.certsrv.logging.ILogger; +import java.math.BigInteger; +import java.security.cert.CRLException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.util.Arrays; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Locale; +import java.util.Set; +import java.util.Vector; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.IAuthToken; -import com.netscape.certsrv.authentication.AuthToken; +import netscape.security.util.DerInputStream; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.RevokedCertImpl; import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509CertInfo; -import netscape.security.x509.RevokedCertImpl; import netscape.security.x509.X509ExtensionException; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateSubjectName; -import netscape.security.util.DerInputStream; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.AuthToken; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.AgentApprovals; +import com.netscape.certsrv.request.IEnrollmentRequest; +import com.netscape.certsrv.request.INotify; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestScheduler; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.request.PolicyResult; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java b/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java index b81d5d211..f85beca0a 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/request/ARequestRecord.java @@ -18,8 +18,8 @@ package com.netscape.cmscore.request; -import java.util.Hashtable; import java.util.Date; +import java.util.Hashtable; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; diff --git a/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java b/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java index cdc5a7eea..b72eb5f5a 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java +++ b/pki/base/common/src/com/netscape/cmscore/request/ExtDataHashtable.java @@ -1,6 +1,9 @@ package com.netscape.cmscore.request; -import java.util.*; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; /** * Subclass of Hashtable returned by IRequest.getExtDataInHashtable. Its diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java b/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java index ea60dc470..4583a1fac 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestAttr.java @@ -18,11 +18,11 @@ package com.netscape.cmscore.request; +import com.netscape.certsrv.dbs.IDBAttrMapper; import com.netscape.certsrv.dbs.Modification; import com.netscape.certsrv.dbs.ModificationSet; -import com.netscape.certsrv.dbs.IDBAttrMapper; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.request.ldap.*; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.ldap.IRequestMod; /** diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java b/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java index f390d436d..b748f23bb 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestQueue.java @@ -19,33 +19,28 @@ package com.netscape.cmscore.request; import java.math.BigInteger; - import java.util.Date; import java.util.Enumeration; -import com.netscape.certsrv.dbs.ModificationSet; -import com.netscape.certsrv.dbs.IDBSearchResults; -import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.IDBSSession; +import com.netscape.certsrv.dbs.IDBSearchResults; import com.netscape.certsrv.dbs.IDBSubsystem; -import com.netscape.cmscore.dbs.DBSubsystem; - -import com.netscape.certsrv.base.EBaseException; - -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.ldap.*; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IRequestRecord; -import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.dbs.IDBVirtualList; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.repository.IRepository; import com.netscape.certsrv.request.INotify; -import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestList; +import com.netscape.certsrv.request.IRequestRecord; import com.netscape.certsrv.request.IRequestVirtualList; -import com.netscape.cmscore.request.ARequestQueue; -import com.netscape.certsrv.dbs.repository.IRepository; - +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.request.ldap.IRequestMod; +import com.netscape.cmscore.dbs.DBSubsystem; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java b/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java index 85995aaa3..46f69eaab 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestRecord.java @@ -18,38 +18,39 @@ package com.netscape.cmscore.request; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.NotSerializableException; -import java.io.ObjectStreamException; -import java.io.Serializable; -import java.io.ByteArrayOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ObjectOutputStream; import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamException; import java.math.BigInteger; - import java.util.Date; import java.util.Enumeration; -import java.util.Vector; import java.util.Hashtable; - +import java.util.Vector; import netscape.ldap.LDAPAttribute; import netscape.ldap.LDAPAttributeSet; import com.netscape.certsrv.base.EBaseException; - -import com.netscape.certsrv.dbs.*; -import com.netscape.cmscore.dbs.StringMapper; -import com.netscape.cmscore.dbs.DateMapper; -import com.netscape.cmscore.dbs.BigIntegerMapper; - -import com.netscape.certsrv.request.ldap.*; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBAttrMapper; +import com.netscape.certsrv.dbs.IDBDynAttrMapper; +import com.netscape.certsrv.dbs.IDBObj; +import com.netscape.certsrv.dbs.IDBRegistry; +import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestRecord; - +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.request.RequestStatus; +import com.netscape.certsrv.request.ldap.IRequestMod; +import com.netscape.cmscore.dbs.BigIntegerMapper; +import com.netscape.cmscore.dbs.DateMapper; +import com.netscape.cmscore.dbs.StringMapper; import com.netscape.cmscore.util.Debug; diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java b/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java index c6ab7129e..1dafc2a7a 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestRepository.java @@ -17,17 +17,20 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.request; -import java.util.*; -import java.io.*; -import java.math.*; +import java.math.BigInteger; +import java.util.Enumeration; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.EDBException; +import com.netscape.certsrv.dbs.IDBSSession; import com.netscape.certsrv.dbs.IDBSubsystem; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.dbs.*; +import com.netscape.certsrv.dbs.Modification; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.cmscore.dbs.Repository; +import com.netscape.cmscore.dbs.RepositoryRecord; /** diff --git a/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java b/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java index 2e05e54eb..90df99248 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/request/RequestSubsystem.java @@ -18,19 +18,20 @@ package com.netscape.cmscore.request; +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.ISubsystem; - -import com.netscape.certsrv.logging.ILogger; - import com.netscape.certsrv.dbs.IDBSSession; import com.netscape.certsrv.dbs.IDBSubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.request.INotify; +import com.netscape.certsrv.request.IPolicy; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IRequestSubsystem; +import com.netscape.certsrv.request.IService; import com.netscape.cmscore.dbs.DBSubsystem; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.request.*; - /** * RequestSubsystem diff --git a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java index 22d0b8c17..04f442a35 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/CASigningCert.java @@ -18,25 +18,21 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; + import com.netscape.certsrv.apps.CMS; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java index f702f2e87..c492feac0 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java @@ -18,24 +18,46 @@ package com.netscape.cmscore.security; -import java.io.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.CertificateException; +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.Signature; +import java.util.Date; + +import netscape.security.util.DerInputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateIssuerName; +import netscape.security.x509.CertificateSerialNumber; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.SignatureAlgorithm; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java index f9d8114cd..d0df7d1a9 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java @@ -18,42 +18,88 @@ package com.netscape.cmscore.security; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.KeyPairGenerator; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.math.BigInteger; +import java.net.SocketException; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.InvalidParameterException; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.Principal; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.ldap.util.DN; +import netscape.security.x509.AlgIdDSA; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.CryptoManager.NicknameConflictException; +import org.mozilla.jss.CryptoManager.NotInitializedException; +import org.mozilla.jss.CryptoManager.UserCertConflictException; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SET; +import org.mozilla.jss.crypto.AlreadyInitializedException; +import org.mozilla.jss.crypto.CryptoStore; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.InternalCertificate; +import org.mozilla.jss.crypto.KeyPairAlgorithm; +import org.mozilla.jss.crypto.NoSuchItemOnTokenException; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; import org.mozilla.jss.crypto.PrivateKey; -import org.mozilla.jss.crypto.*; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenCertificate; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11SecureRandom; +import org.mozilla.jss.pkcs7.ContentInfo; +import org.mozilla.jss.pkcs7.SignedData; import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.ssl.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkcs7.*; +import org.mozilla.jss.ssl.SSLServerSocket; +import org.mozilla.jss.ssl.SSLSocket; +import org.mozilla.jss.util.IncorrectPasswordException; import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.ConsolePasswordCallback; -import org.mozilla.jss.util.IncorrectPasswordException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.common.NameValuePair; +import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.security.*; -import java.util.*; -import java.net.*; -import java.io.*; -import java.text.*; -import java.math.*; -import java.security.*; -import java.security.cert.CertificateEncodingException; -import netscape.security.x509.*; -import java.security.cert.CertificateException; -import org.mozilla.jss.CryptoManager.NotInitializedException; -import org.mozilla.jss.CryptoManager.NicknameConflictException; -import org.mozilla.jss.CryptoManager.UserCertConflictException; -import org.mozilla.jss.pkcs11.PK11SecureRandom; -import com.netscape.cmscore.cert.*; +import com.netscape.certsrv.security.ICryptoSubsystem; +import com.netscape.certsrv.security.KeyCertData; +import com.netscape.cmscore.cert.CertPrettyPrint; +import com.netscape.cmscore.cert.CertUtils; import com.netscape.cmscore.util.Debug; -import netscape.ldap.util.*; -import com.netscape.cmsutil.crypto.*; +import com.netscape.cmsutil.crypto.CryptoUtil; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java index 4f551cd26..753c6cc46 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java @@ -18,48 +18,103 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.asn1.*; - -import java.security.PrivateKey; -import java.security.*; -import java.util.*; -import java.security.interfaces.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FilterOutputStream; import java.io.IOException; -import java.io.*; +import java.io.PrintStream; +import java.math.BigInteger; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.InvalidParameterException; +import java.security.KeyPair; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SignatureException; +import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; -import org.mozilla.jss.crypto.KeyPairGenerator; -import org.mozilla.jss.crypto.*; -import java.math.*; -//import java.security.cert.*; -import org.mozilla.jss.crypto.X509Certificate; -//import netscape.security.provider.DSAPublicKey; -// ADDED next line by MLH on 1/9/99 -// REMOVED the line added by MLH on 1/10/99 -//import netscape.security.provider.RSAPublicKey; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import org.mozilla.jss.*; -import org.mozilla.jss.pkcs11.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.CryptoManager.NotInitializedException; +import java.security.interfaces.DSAParams; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.extensions.ExtendedKeyUsageExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.extensions.OCSPNoCheckExtension; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS10Attribute; +import netscape.security.pkcs.PKCS10Attributes; +import netscape.security.pkcs.PKCS9Attribute; +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgIdDSA; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.AuthorityKeyIdentifierExtension; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertAttrSet; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.Extensions; +import netscape.security.x509.GeneralName; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.URIName; +import netscape.security.x509.X500Name; +import netscape.security.x509.X500Signer; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + +import org.mozilla.jss.CryptoManager; import org.mozilla.jss.CryptoManager.NicknameConflictException; +import org.mozilla.jss.CryptoManager.NotInitializedException; import org.mozilla.jss.CryptoManager.UserCertConflictException; -import java.security.cert.CertificateEncodingException; -import netscape.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.cmscore.cert.*; -import com.netscape.cmscore.util.*; -import com.netscape.cmscore.dbs.*; -import com.netscape.cmsutil.crypto.*; +import org.mozilla.jss.NoSuchTokenException; +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Header; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.BIT_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.InternalCertificate; +import org.mozilla.jss.crypto.KeyPairAlgorithm; +import org.mozilla.jss.crypto.KeyPairGenerator; +import org.mozilla.jss.crypto.NoSuchItemOnTokenException; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; +import org.mozilla.jss.crypto.Signature; +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.crypto.X509Certificate; +import org.mozilla.jss.pkcs11.PK11ECPublicKey; +import org.mozilla.jss.util.Base64OutputStream; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; +import com.netscape.cmscore.cert.CertUtils; +import com.netscape.cmscore.dbs.BigIntegerMapper; +import com.netscape.cmscore.dbs.DateMapper; +import com.netscape.cmscore.dbs.X509CertImplMapper; +import com.netscape.cmsutil.crypto.CryptoUtil; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java index 279a62347..efeade921 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/OCSPSigningCert.java @@ -18,25 +18,21 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import java.io.IOException; +import java.math.BigInteger; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import org.mozilla.jss.crypto.PQGParamGenException; +import org.mozilla.jss.crypto.PQGParams; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java index 299b9f6e6..48b19f62b 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java @@ -18,20 +18,17 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.SecretDecoderRing; -import org.mozilla.jss.crypto.TokenException; -import java.io.*; -import java.lang.*; -import java.util.Hashtable; -import java.util.StringTokenizer; +import java.io.File; +import java.io.InputStream; +import java.io.OutputStream; + import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; import org.mozilla.jss.util.PasswordCallbackInfo; -import com.netscape.cmscore.base.*; + import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.base.JDialogPasswordCallback; /* diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java b/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java index afba0a4db..3be636912 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java @@ -18,11 +18,11 @@ package com.netscape.cmscore.security; -import java.lang.*; -import java.io.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; + import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; -import org.mozilla.jss.util.PasswordCallbackInfo; public class diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java index 309978f28..12412f59c 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java @@ -18,22 +18,31 @@ package com.netscape.cmscore.security; -import org.mozilla.jss.SecretDecoderRing.KeyManager; -import org.mozilla.jss.SecretDecoderRing.Encryptor; -import org.mozilla.jss.SecretDecoderRing.Decryptor; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.CryptoToken; -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.util.Password; -import org.mozilla.jss.util.Base64OutputStream; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.FilterOutputStream; +import java.io.IOException; +import java.io.PrintStream; import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.base.EBaseException; + +import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.CryptoManager.NotInitializedException; +import org.mozilla.jss.SecretDecoderRing.Decryptor; +import org.mozilla.jss.SecretDecoderRing.Encryptor; +import org.mozilla.jss.SecretDecoderRing.KeyManager; +import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.crypto.TokenException; +import org.mozilla.jss.util.Base64OutputStream; +import org.mozilla.jss.util.Password; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.logging.ILogger; import com.netscape.cmsutil.util.Utils; diff --git a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java b/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java index c6f2f7cbc..1ac8f0ea7 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/RASigningCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java b/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java index 0967b0930..eab48bdf5 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SSLCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java index d38b35b44..ac7eb2ad9 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.*; -import java.io.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.X509Certificate; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.crypto.*; -import java.security.cert.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java b/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java index 4244d0212..bd630de84 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java +++ b/pki/base/common/src/com/netscape/cmscore/security/SubsystemCert.java @@ -18,25 +18,16 @@ package com.netscape.cmscore.security; -import netscape.security.x509.*; -import netscape.security.util.*; -import java.util.*; -import java.io.*; -import java.math.*; -import java.security.PrivateKey; -import java.security.InvalidKeyException; -import java.security.SignatureException; -import java.security.cert.*; -import java.security.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import org.mozilla.jss.crypto.Signature; -import org.mozilla.jss.crypto.TokenException; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.CryptoManager.*; -import org.mozilla.jss.*; +import java.io.IOException; +import java.security.KeyPair; + +import netscape.security.x509.KeyUsageExtension; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.security.KeyCertData; /** diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java index 22e4044ac..f462c2e22 100644 --- a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java +++ b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestOrderedInstance.java @@ -25,7 +25,7 @@ package com.netscape.cmscore.selftests; // import statements // /////////////////////// -import java.util.*; +import java.util.StringTokenizer; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index 5c75d8fd5..209be47df 100644 --- a/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -25,13 +25,29 @@ package com.netscape.cmscore.selftests; // import statements // /////////////////////// -import java.io.*; -import java.util.*; -import java.text.MessageFormat; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.ListIterator; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.ELogException; +import com.netscape.certsrv.logging.ILogEventListener; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.selftests.EDuplicateSelfTestException; +import com.netscape.certsrv.selftests.EInvalidSelfTestException; +import com.netscape.certsrv.selftests.EMissingSelfTestException; +import com.netscape.certsrv.selftests.ESelfTestException; +import com.netscape.certsrv.selftests.ISelfTest; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; ////////////////////// diff --git a/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java b/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java index 0427d82d7..082ae4bef 100644 --- a/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java +++ b/pki/base/common/src/com/netscape/cmscore/time/SimpleTimeSource.java @@ -18,8 +18,9 @@ package com.netscape.cmscore.time; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Date; + +import com.netscape.certsrv.base.ITimeSource; public class SimpleTimeSource implements ITimeSource { diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java index f9312c1c4..4bf348ff7 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/CertDNCertUserLocator.java @@ -18,14 +18,17 @@ package com.netscape.cmscore.usrgrp; -import netscape.ldap.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; +import java.security.cert.X509Certificate; + +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; /** diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java index 0fb4d0d98..a7aeeb1ed 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/ExactMatchCertUserLocator.java @@ -18,14 +18,17 @@ package com.netscape.cmscore.usrgrp; -import netscape.ldap.*; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; +import java.security.cert.X509Certificate; + +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.usrgrp.Certificates; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; /** diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java index 05aec23dc..79f60dbde 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/Group.java @@ -18,10 +18,13 @@ package com.netscape.cmscore.usrgrp; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUsrGrp; /** diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index d19cbf2d3..0c1180362 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -18,22 +18,40 @@ package com.netscape.cmscore.usrgrp; -import java.util.*; -import java.lang.*; -import netscape.ldap.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.usrgrp.*; - -import com.netscape.cmscore.ldapconn.*; -import com.netscape.cmscore.ldap.*; -import com.netscape.cmscore.util.*; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPAttributeSet; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPDN; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPModificationSet; +import netscape.ldap.LDAPSearchConstraints; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.usrgrp.EUsrGrpException; +import com.netscape.certsrv.usrgrp.ICertUserLocator; +import com.netscape.certsrv.usrgrp.IGroup; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.certsrv.usrgrp.IUsrGrp; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java index 5ecb4f169..c8eb780a0 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/User.java @@ -18,14 +18,14 @@ package com.netscape.cmscore.usrgrp; -import java.util.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.apps.*; +import java.security.cert.X509Certificate; +import java.util.Enumeration; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.certsrv.usrgrp.IUsrGrp; /** diff --git a/pki/base/common/src/com/netscape/cmscore/util/Debug.java b/pki/base/common/src/com/netscape/cmscore/util/Debug.java index b9b794e9c..417f3159b 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/Debug.java +++ b/pki/base/common/src/com/netscape/cmscore/util/Debug.java @@ -18,13 +18,17 @@ package com.netscape.cmscore.util; -import com.netscape.certsrv.base.*; -import com.netscape.cmsutil.util.*; - -import java.lang.*; -import java.io.*; -import java.util.*; -import java.text.*; +import java.io.FileOutputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.cmsutil.util.Utils; public class Debug diff --git a/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java b/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java index 61f6f49ec..5cb94fccd 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java +++ b/pki/base/common/src/com/netscape/cmscore/util/ExceptionFormatter.java @@ -18,7 +18,9 @@ package com.netscape.cmscore.util; -import java.io.*; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.io.PrintWriter; public class ExceptionFormatter { diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java b/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java index 968f9cb80..715559f84 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java +++ b/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java @@ -18,8 +18,10 @@ package com.netscape.cmscore.util; -import java.io.*; -import java.lang.StringBuffer; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; public class FileAsString { diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java index 98a2e8422..37410533a 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java +++ b/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java @@ -18,7 +18,8 @@ package com.netscape.cmscore.util; -import java.io.*; +import java.io.File; +import java.io.FilenameFilter; /** diff --git a/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java b/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java index a3cdcbdef..47bb62801 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/util/OsSubsystem.java @@ -18,16 +18,24 @@ package com.netscape.cmscore.util; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.IConfigStore; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; + +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.apps.*; -import com.netscape.cmscore.base.*; -import com.netscape.osutil.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.base.SubsystemRegistry; +import com.netscape.osutil.LibC; +import com.netscape.osutil.OSUtil; +import com.netscape.osutil.ResourceLimit; +import com.netscape.osutil.Signal; +import com.netscape.osutil.SignalListener; +import com.netscape.osutil.UserID; /** diff --git a/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java b/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java index ed268df46..7cde72cce 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java +++ b/pki/base/common/src/com/netscape/cmscore/util/PFXUtils.java @@ -18,20 +18,27 @@ package com.netscape.cmscore.util; -import java.io.*; -import java.util.*; -import java.text.*; - -import java.security.*; -import java.security.cert.*; - -import org.mozilla.jss.CryptoManager; -import org.mozilla.jss.asn1.*; +import java.io.ByteArrayOutputStream; +import java.security.MessageDigest; +import java.security.cert.X509Certificate; + +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.BMPString; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; import org.mozilla.jss.crypto.PBEAlgorithm; -import org.mozilla.jss.pkcs12.*; -import org.mozilla.jss.pkix.primitive.*; +import org.mozilla.jss.pkcs12.AuthenticatedSafes; +import org.mozilla.jss.pkcs12.CertBag; +import org.mozilla.jss.pkcs12.PFX; +import org.mozilla.jss.pkcs12.PasswordConverter; +import org.mozilla.jss.pkcs12.SafeBag; +import org.mozilla.jss.pkix.primitive.EncryptedPrivateKeyInfo; +import org.mozilla.jss.pkix.primitive.PrivateKeyInfo; + import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; public class PFXUtils { diff --git a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java index d7ba11c02..77952d99e 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java @@ -18,13 +18,26 @@ package com.netscape.cmscore.util; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.table.*; -import com.netscape.certsrv.base.*; +import java.awt.Frame; +import java.awt.TextArea; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.Vector; + +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextArea; +import javax.swing.table.AbstractTableModel; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java b/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java index ba07b2ca0..4cc393e06 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/util/StatsSubsystem.java @@ -18,15 +18,16 @@ package com.netscape.cmscore.util; -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.table.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.util.*; -import com.netscape.certsrv.apps.*; +import java.util.Date; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.certsrv.util.StatsEvent; /** * A class represents a internal subsystem. This subsystem diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java b/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java index e9b2a6cdd..a69a976cd 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java +++ b/pki/base/common/src/com/netscape/cmscore/util/UtilMessage.java @@ -18,9 +18,10 @@ package com.netscape.cmscore.util; -import com.netscape.certsrv.base.MessageFormatter; import java.util.Locale; +import com.netscape.certsrv.base.MessageFormatter; + /** * This object is used to easily create I18N messages for utility diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java b/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java index 8114413b0..5892adc39 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java +++ b/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java @@ -18,7 +18,7 @@ package com.netscape.cmscore.util; -import java.util.*; +import java.util.ListResourceBundle; /** -- cgit