diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/certsrv')
254 files changed, 890 insertions, 1060 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java b/pki/base/common/src/com/netscape/certsrv/acls/ACL.java index 38d8aee7..56e53080 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/ACL.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/ACL.java @@ -18,12 +18,8 @@ package com.netscape.certsrv.acls; -import java.util.*; -import java.lang.Object; -import java.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.logging.*; +import java.util.Enumeration; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java b/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java index c5857240..12e38ef4 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/ACLEntry.java @@ -18,10 +18,9 @@ package com.netscape.certsrv.acls; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.acls.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java b/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java index d193365c..878fe163 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/ACLsResources.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.acls; -import java.util.*; +import java.util.ListResourceBundle; /** * A class represents a resource bundle for the entire ACL component. diff --git a/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java b/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java index e982b1bb..8bae56eb 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/EACLsException.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.acls; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java b/pki/base/common/src/com/netscape/certsrv/acls/IACL.java index 9036a365..892bd490 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/IACL.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/IACL.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.acls; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java b/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java index 1646e22f..f91ef38b 100644 --- a/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java +++ b/pki/base/common/src/com/netscape/certsrv/acls/IACLEntry.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.acls; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java b/pki/base/common/src/com/netscape/certsrv/apps/CMS.java index 376dce8b..8136c0b3 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/CMS.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/CMS.java @@ -18,49 +18,85 @@ package com.netscape.certsrv.apps; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import java.io.*; -import java.util.*; -import java.math.*; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +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 netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.password.*; -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.certsrv.request.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.registry.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.jobs.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.authorization.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.tks.*; -import org.mozilla.jss.util.PasswordCallback; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + import org.mozilla.jss.CryptoManager.CertificateUsage; -import java.security.NoSuchAlgorithmException; -import com.netscape.cmsutil.password.*; +import org.mozilla.jss.util.PasswordCallback; + +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.authorization.IAuthzSubsystem; +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.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.common.Constants; +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.IDBSubsystem; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +import com.netscape.certsrv.jobs.IJobsScheduler; +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.ILogSubsystem; +import com.netscape.certsrv.logging.ILogger; +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.ocsp.IOCSPAuthority; +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.IProfileSubsystem; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.registry.IPluginRegistry; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.security.ICryptoSubsystem; +import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.certsrv.tks.ITKSAuthority; +import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cmsutil.net.ISocketFactory; +import com.netscape.cmsutil.password.IPasswordStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java b/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java index 060ab7dc..506a5e33 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/ICMSEngine.java @@ -18,45 +18,67 @@ package com.netscape.certsrv.apps; -import java.math.*; -import java.util.*; -import java.io.IOException; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.Vector; -import java.util.Date; +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.NoSuchAlgorithmException; -import com.netscape.cmsutil.http.*; -import com.netscape.cmsutil.net.*; -import com.netscape.cmsutil.password.*; -import netscape.ldap.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.notification.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.password.*; -import com.netscape.certsrv.authority.*; -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.certsrv.connector.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.usrgrp.*; -import com.netscape.certsrv.kra.*; -import com.netscape.certsrv.ocsp.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.request.*; -import org.mozilla.jss.util.PasswordCallback; +import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSSLSocketFactoryExt; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + import org.mozilla.jss.CryptoManager.CertificateUsage; -import com.netscape.certsrv.acls.*; +import org.mozilla.jss.util.PasswordCallback; + +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +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.ca.ICRLIssuingPoint; +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.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; +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.ILogger; +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.request.IRequest; +import com.netscape.cmsutil.net.ISocketFactory; +import com.netscape.cmsutil.password.IPasswordStore; /** * This interface represents the CMS core framework. The diff --git a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java b/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java index 15224c00..5e223192 100644 --- a/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java +++ b/pki/base/common/src/com/netscape/certsrv/apps/ICommandQueue.java @@ -18,10 +18,6 @@ package com.netscape.certsrv.apps; -import java.util.Hashtable; -import java.util.Enumeration; -import java.util.TimeZone; -import com.netscape.certsrv.apps.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java index e363f01d..dfaad21d 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthCredentials.java @@ -17,9 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.base.IArgBlock; /** * Authentication Credentials as input to the authMgr. It contains all the diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java index cb6e3e4c..f060db5f 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthMgrPlugin.java @@ -18,10 +18,6 @@ package com.netscape.certsrv.authentication; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java index 5bf52f1b..138a07eb 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthResources.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import java.util.*; +import java.util.ListResourceBundle; /** * A class represents a resource bundle for the authentication component. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java b/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java index 4ff2c6a7..7d2d5eb9 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/AuthToken.java @@ -17,25 +17,25 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import java.util.Hashtable; -import java.util.Date; -import java.util.Enumeration; -import java.math.BigInteger; -import java.io.IOException; -import java.io.ByteArrayOutputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.usrgrp.Certificates; +import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; -import netscape.security.util.DerInputStream; -import netscape.security.x509.X509CertImpl; import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.usrgrp.Certificates; /** * Authentication token returned by Authentication Managers. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java index bb04f069..eb36f996 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthCredentials.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import com.netscape.certsrv.base.*; -import java.util.*; +import com.netscape.certsrv.base.IArgBlock; +import com.netscape.certsrv.base.IAttrSet; /** * An interface represents authentication credentials: diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java index c82fa72a..b2f7d69a 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthManager.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import com.netscape.certsrv.base.*; -import java.util.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** * Authentication Manager interface. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java index 0b91fa67..29657e7a 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthSubsystem.java @@ -17,8 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import com.netscape.certsrv.base.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** * An interface that represents an authentication component diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java index f8cb47ec..a8462108 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/IAuthToken.java @@ -17,15 +17,15 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import java.util.Hashtable; +import java.math.BigInteger; import java.util.Date; import java.util.Enumeration; -import java.math.BigInteger; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.usrgrp.Certificates; -import netscape.security.x509.X509CertImpl; import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.usrgrp.Certificates; /** * AuthToken interface. diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java b/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java index 0f024ea6..d4bdf7bb 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/ISSLClientCertProvider.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.authentication; -import java.security.cert.*; -import java.util.*; +import java.security.cert.X509Certificate; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java b/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java index b0806eb6..eae65d17 100644 --- a/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authentication/ISharedToken.java @@ -17,9 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authentication; -import com.netscape.certsrv.base.*; +import java.math.BigInteger; + import org.mozilla.jss.pkix.cmc.PKIData; -import java.math.*; /** * Shared Token interface. diff --git a/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java b/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java index 95fc6bf5..5916ecd0 100644 --- a/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/authority/IAuthority.java @@ -19,12 +19,8 @@ package com.netscape.certsrv.authority; import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.request.IRequestListener; import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.*; -import netscape.security.x509.*; - -import java.io.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java b/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java index 02001338..94d6df40 100644 --- a/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/authority/ICertAuthority.java @@ -18,17 +18,14 @@ package com.netscape.certsrv.authority; -import netscape.security.x509.X500Name; import netscape.security.x509.CertificateChain; +import netscape.security.x509.X500Name; import netscape.security.x509.X509CertImpl; -import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.request.IRequestQueue; -import com.netscape.certsrv.request.IRequest; + import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequestListener; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java index ef8c62f8..b9d9bb96 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzMgrPlugin.java @@ -18,10 +18,6 @@ package com.netscape.certsrv.authorization; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authorization.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java index f17038ef..7cb5240a 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.authorization; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java index dc64d322..2cb6e80b 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/AuthzToken.java @@ -18,10 +18,11 @@ package com.netscape.certsrv.authorization; -import java.util.Hashtable; import java.util.Date; import java.util.Enumeration; -import com.netscape.certsrv.base.*; +import java.util.Hashtable; + +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java b/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java index db016f24..167911c4 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzManager.java @@ -18,11 +18,15 @@ package com.netscape.certsrv.authorization; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.acls.*; -import com.netscape.certsrv.evaluators.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.acls.EACLsException; +import com.netscape.certsrv.acls.IACL; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.evaluators.IAccessEvaluator; /** diff --git a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java b/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java index 2d0f81ee..f6fc3547 100644 --- a/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/authorization/IAuthzSubsystem.java @@ -17,9 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.authorization; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.base.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; + +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** * An interface that represents an authorization component diff --git a/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java b/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java index f8a69f65..f54f1377 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java +++ b/pki/base/common/src/com/netscape/certsrv/base/BaseResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java b/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java index 50ea8fdc..3960d58f 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java +++ b/pki/base/common/src/com/netscape/certsrv/base/EBaseException.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.base; -import java.io.*; -import java.util.*; -import java.text.*; -import java.lang.reflect.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java b/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java index b74131a6..a0399d34 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ExtendedPluginInfo.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; -import java.lang.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java b/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java index 835ad0ed..83c8f85f 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IArgBlock.java @@ -17,13 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.base; -import java.util.*; -import java.io.*; -import netscape.security.pkcs.*; -import java.security.*; +import java.io.Serializable; import java.math.BigInteger; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.BaseResources; +import java.util.Enumeration; + +import netscape.security.pkcs.PKCS10; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java b/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java index 2006c8f2..91f9f51a 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IAuthInfo.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.base; -import java.util.*; -import java.security.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java b/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java index 902c0aad..c770121f 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ICRLPrettyPrint.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java b/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java index dc318649..fc4e8c29 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ICertPrettyPrint.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java b/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java index b53e7c66..1793ff23 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IConfigStore.java @@ -18,8 +18,8 @@ package com.netscape.certsrv.base; -import java.util.Enumeration; import java.math.BigInteger; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java b/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java index 00f9c846..73e95b77 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IExtPrettyPrint.java @@ -18,12 +18,6 @@ package com.netscape.certsrv.base; -import java.io.*; -import java.util.*; -import java.text.*; -import java.math.BigInteger; -import java.security.cert.*; -import java.security.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java b/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java index ac98c6c3..e8060b24 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IExtendedPluginInfo.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.base; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.common.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java b/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java index a32dfc2e..4a55af60 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IPluginImpl.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import java.util.Vector; /** * This interface represents a plugin instance. diff --git a/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java b/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java index 4c962680..1fba48f1 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java +++ b/pki/base/common/src/com/netscape/certsrv/base/IPrettyPrintFormat.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.base; -import java.io.*; -import java.util.*; -import java.text.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java b/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java index a9cdbbf3..3902d443 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISecurityDomainSessionTable.java @@ -17,10 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.base; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.BaseResources; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java b/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java index 7a500bde..fb8628ba 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISourceConfigStore.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.base; -import java.io.Serializable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.Serializable; import java.util.Enumeration; diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java b/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java index d2389508..77f1708a 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISubsystem.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.base; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java b/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java index ad89cc72..23b82179 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ISubsystemSource.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.base; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java b/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java index 86ca5912..f1e3e25e 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java +++ b/pki/base/common/src/com/netscape/certsrv/base/ITimeSource.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.Date; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java b/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java index 634b5d90..17efca77 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java @@ -18,10 +18,12 @@ package com.netscape.certsrv.base; -import java.lang.*; import java.io.IOException; -import netscape.security.util.*; -import netscape.security.x509.*; + +import netscape.security.util.DerInputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X509Key; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java index 796c4255..16324fb9 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MessageFormatter.java @@ -18,10 +18,12 @@ package com.netscape.certsrv.base; -import java.io.*; -import java.util.*; -import java.text.*; -import java.lang.reflect.*; +import java.lang.reflect.Method; +import java.text.MessageFormat; +import java.util.Date; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java b/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java index fc8c8ec8..e01d40f8 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MetaAttributeDef.java @@ -20,6 +20,7 @@ package com.netscape.certsrv.base; import java.util.Enumeration; import java.util.Hashtable; + import netscape.security.util.ObjectIdentifier; diff --git a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java b/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java index 7db52254..3fd0d6a6 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/MetaInfo.java @@ -20,9 +20,6 @@ package com.netscape.certsrv.base; import java.util.Enumeration; import java.util.Hashtable; -import com.netscape.certsrv.base.IAttrSet; -import com.netscape.certsrv.base.AttributeNameHelper; -import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java b/pki/base/common/src/com/netscape/certsrv/base/Nonces.java index e1d992e4..470ba654 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/Nonces.java +++ b/pki/base/common/src/com/netscape/certsrv/base/Nonces.java @@ -17,8 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.base; -import java.util.*; import java.security.cert.X509Certificate; +import java.util.Hashtable; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java b/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java index e0cfe429..287ce795 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java +++ b/pki/base/common/src/com/netscape/certsrv/base/PasswordResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/Plugin.java b/pki/base/common/src/com/netscape/certsrv/base/Plugin.java index 0b7d7ee8..e7001ce5 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/Plugin.java +++ b/pki/base/common/src/com/netscape/certsrv/base/Plugin.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.base; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java b/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java index 79d429d7..5716e6e1 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java +++ b/pki/base/common/src/com/netscape/certsrv/base/SessionContext.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.base; -import java.util.*; +import java.util.Hashtable; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java b/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java index 912d48f6..4510c46b 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/CAResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.ca; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java b/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java index 1d60e3b0..7b05bb6a 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ECAException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.ca; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java b/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java index d4a4c127..cac6fc75 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICAService.java @@ -18,23 +18,14 @@ package com.netscape.certsrv.ca; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java b/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java index 3470b206..edaea59c 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtension.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.ca; import netscape.security.x509.Extension; -import netscape.security.x509.CRLExtensions; + import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.common.NameValuePairs; diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java b/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java index 6e6a47c9..f6df2226 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICMSCRLExtensions.java @@ -18,8 +18,8 @@ package com.netscape.certsrv.ca; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java b/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java index 97f9792f..82e0961c 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICRLIssuingPoint.java @@ -18,22 +18,20 @@ package com.netscape.certsrv.ca; -import java.util.*; -import java.math.*; -import java.io.*; -import java.security.*; -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.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.request.IRequest; +import java.math.BigInteger; +import java.util.Date; +import java.util.Set; +import java.util.Vector; + +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.RevokedCertImpl; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.dbs.IElementProcessor; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java b/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java index bc545a9b..6f7a4961 100644 --- a/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java @@ -18,24 +18,31 @@ package com.netscape.certsrv.ca; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import org.mozilla.jss.crypto.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.replicadb.*; +import java.util.Enumeration; + +import netscape.security.x509.CertificateChain; +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 org.mozilla.jss.crypto.SignatureAlgorithm; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.base.Nonces; +import com.netscape.certsrv.dbs.certdb.ICertificateRepository; +import com.netscape.certsrv.dbs.crldb.ICRLRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestNotifier; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.IService; +import com.netscape.certsrv.security.ISigningUnit; /** diff --git a/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java b/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java index 81d5cbef..653c684f 100644 --- a/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/cert/ICrossCertPairSubsystem.java @@ -18,8 +18,11 @@ package com.netscape.certsrv.cert; -import com.netscape.certsrv.base.*; -import java.security.cert.*; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java b/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java index 139585f2..ff83cadd 100644 --- a/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java +++ b/pki/base/common/src/com/netscape/certsrv/client/connection/IAuthenticator.java @@ -17,8 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.client.connection; -import java.io.*; -import java.util.*; /** * An interface represents authentiator. diff --git a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java b/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java index b4fecd15..1542d5fa 100644 --- a/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/client/connection/IConnectionFactory.java @@ -17,8 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.client.connection; -import java.net.*; -import java.io.*; +import java.io.IOException; +import java.net.UnknownHostException; /** * Interface for all connection factory. Primarily act as diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java b/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java index 92466d30..44d55e32 100644 --- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java +++ b/pki/base/common/src/com/netscape/certsrv/common/NameValuePair.java @@ -18,12 +18,6 @@ package com.netscape.certsrv.common; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java b/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java index a2530521..678ccfee 100644 --- a/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java +++ b/pki/base/common/src/com/netscape/certsrv/common/NameValuePairs.java @@ -18,12 +18,10 @@ package com.netscape.certsrv.common; -import java.io.*; -import java.util.*; -import java.net.*; -import java.util.*; -import java.text.*; -import java.math.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java b/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java index e89c14f5..6dcca9d2 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IConnector.java @@ -18,8 +18,8 @@ package com.netscape.certsrv.connector; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java b/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java index a52d90e9..c53c6f09 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnFactory.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.connector; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; +import com.netscape.certsrv.base.EBaseException; /** * Maintains a pool of connections to to a Remote Authority. diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java b/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java index 610ab30e..6ee57059 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IHttpConnection.java @@ -18,13 +18,7 @@ package com.netscape.certsrv.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.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java b/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java index 83241170..5cb53e25 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IHttpPKIMessage.java @@ -19,9 +19,6 @@ package com.netscape.certsrv.connector; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.connector.*; -import java.util.*; -import java.io.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java b/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java index 593261d9..57ce9700 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IPKIMessage.java @@ -18,9 +18,10 @@ package com.netscape.certsrv.connector; -import com.netscape.certsrv.request.IRequest; import java.io.Serializable; +import com.netscape.certsrv.request.IRequest; + /** * Messages that are serialized and go over the wire. diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java b/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java index 90dcbaa2..a97936aa 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IRemoteAuthority.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.connector; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/connector/IResender.java b/pki/base/common/src/com/netscape/certsrv/connector/IResender.java index b9305816..3574c3a5 100644 --- a/pki/base/common/src/com/netscape/certsrv/connector/IResender.java +++ b/pki/base/common/src/com/netscape/certsrv/connector/IResender.java @@ -18,17 +18,7 @@ package com.netscape.certsrv.connector; -import com.netscape.certsrv.base.*; -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.cmsutil.http.*; - -import java.util.Vector; -import java.util.Enumeration; -import java.io.*; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java b/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java index 54e65ce3..4bfb14fb 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/DBResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.dbs; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java b/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java index b0fa4bff..335da55a 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/EDBException.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java index d7b82f25..7d851b74 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBAttrMapper.java @@ -18,9 +18,11 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java index 1616e741..4be6c340 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBObj.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java index faf18a34..4270c9ce 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBRegistry.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import netscape.ldap.LDAPAttributeSet; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java index 09364dc6..34df47c9 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSSession.java @@ -18,9 +18,10 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import netscape.ldap.LDAPSearchResults; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java index 71356eb4..ab90866b 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSearchResults.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java index e82a3a14..350a29c4 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java @@ -18,9 +18,12 @@ package com.netscape.certsrv.dbs; -import java.math.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import java.math.BigInteger; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java index 93b1f87f..8e627520 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBVirtualList.java @@ -18,11 +18,7 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import netscape.ldap.controls.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java b/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java index d43145d8..75702199 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IElementProcessor.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.dbs; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java b/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java index d31ccd46..1a078365 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IFilterConverter.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.dbs; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java b/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java index 3a28b133..9be75f0b 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/Modification.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.dbs; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java b/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java index 0e310818..4a5592c0 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/ModificationSet.java @@ -18,7 +18,8 @@ package com.netscape.certsrv.dbs; -import java.util.*; +import java.util.Enumeration; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java index febb684c..681e586b 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecord.java @@ -18,12 +18,14 @@ package com.netscape.certsrv.dbs.certdb; -import java.util.Date; import java.math.BigInteger; -import com.netscape.certsrv.dbs.IDBObj; -import com.netscape.certsrv.base.MetaInfo; +import java.util.Date; + import netscape.security.x509.X509CertImpl; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.IDBObj; + /** * An interface contains constants for certificate record. diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java index cc8c3818..a7745888 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertRecordList.java @@ -18,11 +18,10 @@ package com.netscape.certsrv.dbs.certdb; -import java.util.*; -import java.io.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IElementProcessor; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java index c036909d..b913a18c 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/ICertificateRepository.java @@ -18,17 +18,19 @@ package com.netscape.certsrv.dbs.certdb; -import java.math.*; -import java.util.*; -import java.io.*; -import java.security.*; -import java.security.cert.*; +import java.math.BigInteger; import java.security.cert.Certificate; -import netscape.security.x509.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; + +import netscape.ldap.LDAPEntry; +import netscape.security.x509.X509CertImpl; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MetaInfo; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java index 15e39694..2086cacb 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/certdb/IRevocationInfo.java @@ -18,14 +18,9 @@ package com.netscape.certsrv.dbs.certdb; -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 java.util.Date; + +import netscape.security.x509.CRLExtensions; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java index f0d98fd5..991a952a 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLIssuingPointRecord.java @@ -18,16 +18,11 @@ package com.netscape.certsrv.dbs.crldb; -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 java.math.BigInteger; +import java.util.Date; +import java.util.Hashtable; + +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java index ffac9b37..ba245bcf 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/crldb/ICRLRepository.java @@ -18,17 +18,13 @@ package com.netscape.certsrv.dbs.crldb; -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.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import java.math.BigInteger; +import java.util.Date; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.ModificationSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java index f795ff9a..0edcc187 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecord.java @@ -18,9 +18,10 @@ package com.netscape.certsrv.dbs.keydb; -import java.util.*; -import java.math.*; -import com.netscape.certsrv.base.*; +import java.math.BigInteger; +import java.util.Date; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java index aced5cc1..2bc9f57b 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRecordList.java @@ -18,12 +18,9 @@ package com.netscape.certsrv.dbs.keydb; -import java.util.*; -import java.io.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java index 324a7df1..093bea25 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/IKeyRepository.java @@ -18,17 +18,15 @@ package com.netscape.certsrv.dbs.keydb; -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.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import java.math.BigInteger; +import java.security.PublicKey; +import java.util.Enumeration; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.ModificationSet; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java index a6b7fa03..d6e2fafb 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/keydb/KeyState.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.dbs.keydb; -import java.util.*; -import java.io.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; +import java.io.Serializable; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java index e92d13a1..660b6e9e 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/IReplicaIDRepository.java @@ -17,8 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.dbs.replicadb; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.repository.*; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java index 7ee01b3f..5ff90241 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepository.java @@ -17,13 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.dbs.repository; -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 java.math.BigInteger; + +import com.netscape.certsrv.base.EBaseException; /** * An interface represents a generic repository. It maintains unique diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java index 5e6db669..326ea466 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/repository/IRepositoryRecord.java @@ -17,14 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.dbs.repository; -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 java.math.BigInteger; + +import com.netscape.certsrv.dbs.IDBObj; /** * An interface represents a generic repository record. diff --git a/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java b/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java index 5764f400..8c291447 100644 --- a/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java +++ b/pki/base/common/src/com/netscape/certsrv/evaluators/IAccessEvaluator.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.evaluators; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.authentication.*; +import com.netscape.certsrv.authentication.IAuthToken; /** diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java b/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java index 297b4426..e7652376 100644 --- a/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java +++ b/pki/base/common/src/com/netscape/certsrv/extensions/EExtensionsException.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.extensions; -import java.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java b/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java index b50638dd..4d7ee06c 100644 --- a/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java +++ b/pki/base/common/src/com/netscape/certsrv/extensions/ExtensionsResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.extensions; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java b/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java index 55f348b1..fb4bb1f7 100644 --- a/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java +++ b/pki/base/common/src/com/netscape/certsrv/extensions/ICMSExtension.java @@ -18,16 +18,13 @@ package com.netscape.certsrv.extensions; -import java.util.Locale; -import java.util.Vector; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.Extension; -import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; - -import netscape.security.x509.Extension; -import netscape.security.util.ObjectIdentifier; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java b/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java index 37528c60..cbcddb39 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/EJobsException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.jobs; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java b/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java index 41062998..1c3842bf 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/IJob.java @@ -18,7 +18,9 @@ package com.netscape.certsrv.jobs; -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/certsrv/jobs/IJobCron.java b/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java index 9e6d2b4d..1e238f60 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/IJobCron.java @@ -18,11 +18,6 @@ package com.netscape.certsrv.jobs; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; - -import java.util.*; -import java.lang.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java b/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java index d30ccbf3..fefa8cc9 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/IJobsScheduler.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.jobs; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Hashtable; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java b/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java index d610ee90..33b7e7f2 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/JobPlugin.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.jobs; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java b/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java index 00c05790..9bc82826 100644 --- a/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java +++ b/pki/base/common/src/com/netscape/certsrv/jobs/JobsResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.jobs; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java b/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java index 7992d5fb..7f67f7a6 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/EKRAException.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.kra; -import java.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java b/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java index b2d02f2a..b268073e 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java @@ -18,21 +18,25 @@ package com.netscape.certsrv.kra; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.math.*; -import netscape.security.x509.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.keydb.*; -import com.netscape.certsrv.dbs.replicadb.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.security.*; -import org.mozilla.jss.crypto.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.x509.X500Name; + +import org.mozilla.jss.crypto.CryptoToken; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.dbs.keydb.IKeyRepository; +import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestId; +import com.netscape.certsrv.security.Credential; +import com.netscape.certsrv.security.IStorageKeyUnit; +import com.netscape.certsrv.security.ITransportKeyUnit; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java b/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java index 5fe5a402..5785aeb0 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java @@ -20,11 +20,12 @@ package com.netscape.certsrv.kra; import java.math.BigInteger; import java.util.Hashtable; -import java.security.cert.X509Certificate; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; + import netscape.security.x509.X509CertImpl; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.security.Credential; + /** * An interface representing a recovery service. diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java b/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java index 571380ea..1b484b66 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/IProofOfArchival.java @@ -18,14 +18,8 @@ package com.netscape.certsrv.kra; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; +import java.math.BigInteger; +import java.util.Date; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java b/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java index 74f66992..40e0ee17 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/KRAResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.kra; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java b/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java index 5fe06f92..5a9fb119 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/ProofOfArchival.java @@ -18,17 +18,29 @@ package com.netscape.certsrv.kra; -import java.io.*; -import java.math.*; -import java.util.*; -import java.security.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; -import netscape.security.x509.*; -//import com.netscape.cmscore.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; +import java.io.IOException; +import java.io.InputStream; +import java.io.Serializable; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.Signature; +import java.security.SignatureException; +import java.util.Date; +import java.util.Enumeration; +import java.util.Vector; + +import netscape.security.util.BigInt; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.IDBObj; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java b/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java index 3f829aa3..a6907c00 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ELdapException.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.ldap; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java index 13cadf2a..46082c73 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapAuthInfo.java @@ -18,15 +18,8 @@ package com.netscape.certsrv.ldap; -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.base.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java index 71b81070..ef3e1742 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapBoundConnFactory.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.ldap; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java index 8ac2cd50..f706c2ec 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnFactory.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.ldap; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java index f56bf4d3..4cffbe45 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnInfo.java @@ -18,10 +18,8 @@ package com.netscape.certsrv.ldap; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.base.EPropertyNotFound; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java index 3cf76266..8d912fc5 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/ILdapConnModule.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.ldap; -import com.netscape.certsrv.base.*; -import java.security.cert.*; +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/certsrv/ldap/LdapResources.java b/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java index 79a8aecb..26149738 100644 --- a/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java +++ b/pki/base/common/src/com/netscape/certsrv/ldap/LdapResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.ldap; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java b/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java index 40dad6eb..1dae2728 100644 --- a/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java +++ b/pki/base/common/src/com/netscape/certsrv/listeners/EListenersException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.listeners; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java b/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java index 83f6bd68..b0cb173c 100644 --- a/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/listeners/IRequestListenerPlugin.java @@ -18,7 +18,8 @@ package com.netscape.certsrv.listeners; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** * This interface represents a plug-in listener. Implement this class to diff --git a/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java b/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java index 7fae366d..199941be 100644 --- a/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java +++ b/pki/base/common/src/com/netscape/certsrv/listeners/ListenersResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.listeners; -import java.util.*; +import java.util.ListResourceBundle; /** * A class represents a resource bundle for the diff --git a/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java b/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java index 8fa1249f..415b35d0 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/AuditEvent.java @@ -18,11 +18,11 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.text.MessageFormat; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java b/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java index 750e3580..146824ac 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ConsoleError.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.logging; -import com.netscape.certsrv.logging.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java b/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java index c45b5d12..c18b062c 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ConsoleLog.java @@ -18,13 +18,16 @@ package com.netscape.certsrv.logging; -import javax.servlet.*; -import javax.servlet.http.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; +import java.io.IOException; +import java.util.Hashtable; +import java.util.Vector; + +import javax.servlet.ServletException; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java b/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java index d1503365..12f5ede2 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ELogException.java @@ -18,9 +18,8 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.*; +import java.util.Locale; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.MessageFormatter; diff --git a/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java b/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java index fc9540e5..44a4283b 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/IBundleLogEvent.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.logging; -import java.io.Serializable; -import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java index b0fd0ce1..f94f20a9 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogEventFactory.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; +import java.util.Properties; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java index e970d418..12c09b0b 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogEventListener.java @@ -18,16 +18,22 @@ package com.netscape.certsrv.logging; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.io.*; -import javax.servlet.*; -import javax.servlet.http.*; -import com.netscape.certsrv.common.*; +import java.io.IOException; +import java.util.EventListener; +import java.util.Hashtable; +import java.util.Vector; + +import javax.servlet.ServletException; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; + /** - * An interface reprensents a log event listener. + * An interface represents a log event listener. * A ILogEventListener is registered to a specific * ILogQueue to be notified of created ILogEvents. * the log queue will notify all its registered listeners @@ -67,7 +73,7 @@ public interface ILogEventListener extends EventListener { * Initialize this log listener * @param owner The subsystem. * @param config Configuration store for this log listener. - * @exception Any initialization error. + * @exception initialization error. */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException; diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java index 65d4136c..878b9ba1 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogQueue.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.logging; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java index 82bde43f..438c4250 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogSubsystem.java @@ -18,11 +18,10 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.MessageFormat; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java b/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java index b4a7070a..01fbc6b9 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/ILogger.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.logging; -import java.util.*; -import com.netscape.certsrv.common.*; +import java.util.Properties; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java b/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java index 30ee3083..b8195eec 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/LogPlugin.java @@ -18,11 +18,7 @@ package com.netscape.certsrv.logging; -import java.util.*; -import java.lang.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.Plugin; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java b/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java index 942b570d..6a7472ff 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/LogResources.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.logging; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.ListResourceBundle; +import java.util.ResourceBundle; + +import com.netscape.certsrv.base.BaseResources; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java b/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java index ea97fe3d..7b87d67b 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java @@ -18,11 +18,11 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.text.MessageFormat; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java b/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java index 648d3b18..f59a10df 100644 --- a/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/logging/SystemEvent.java @@ -18,11 +18,11 @@ package com.netscape.certsrv.logging; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import java.text.MessageFormat; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java b/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java index a5347ff4..cc2687bc 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/ENotificationException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.notification; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java index 234c7a46..9d7ee46f 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailFormProcessor.java @@ -18,10 +18,8 @@ package com.netscape.certsrv.notification; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; -import java.util.*; -import java.lang.*; +import java.util.Hashtable; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java index 6b654da4..49d0851e 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolver.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.notification; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java index 2382412c..d1a6889c 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailResolverKeys.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.notification; -import com.netscape.certsrv.base.*; -import java.util.*; +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java b/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java index 74c97402..bcda466d 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IEmailTemplate.java @@ -18,12 +18,6 @@ package com.netscape.certsrv.notification; -import java.lang.*; -import java.io.*; -import java.util.*; - -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java b/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java index 4301f532..c5375cae 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/IMailNotification.java @@ -18,17 +18,8 @@ package com.netscape.certsrv.notification; -import java.util.*; -import java.io.*; -import java.lang.String; -import netscape.net.smtp.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.notification.*; -import netscape.security.x509.*; +import java.io.IOException; +import java.util.Vector; /** diff --git a/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java b/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java index e9cdbdfa..40d9e80e 100644 --- a/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java +++ b/pki/base/common/src/com/netscape/certsrv/notification/NotificationResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.notification; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java b/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java index a9c24fdc..82c5821b 100644 --- a/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java +++ b/pki/base/common/src/com/netscape/certsrv/ocsp/IDefStore.java @@ -18,14 +18,14 @@ package com.netscape.certsrv.ocsp; -import java.util.*; -import java.math.*; -import java.security.cert.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.repository.*; -import com.netscape.cmsutil.ocsp.*; +import java.math.BigInteger; +import java.security.cert.X509CRL; +import java.util.Date; +import java.util.Enumeration; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; +import com.netscape.certsrv.dbs.repository.IRepositoryRecord; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java index 84b223a8..b99f6241 100644 --- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPAuthority.java @@ -18,29 +18,17 @@ package com.netscape.certsrv.ocsp; -import java.util.*; -import java.security.*; -import java.util.Vector; -import java.io.*; -import java.io.InputStream; -import java.io.IOException; - -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import netscape.security.x509.*; +import netscape.security.x509.X500Name; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.security.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import com.netscape.cmsutil.ocsp.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.security.ISigningUnit; +import com.netscape.cmsutil.ocsp.BasicOCSPResponse; +import com.netscape.cmsutil.ocsp.ResponderID; +import com.netscape.cmsutil.ocsp.ResponseData; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java index 9bd9ba02..8ca8b2f0 100644 --- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java +++ b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPService.java @@ -18,28 +18,9 @@ package com.netscape.certsrv.ocsp; -import java.util.*; -import java.security.*; -import java.util.Vector; -import java.io.*; -import java.io.InputStream; -import java.io.IOException; - -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.asn1.INTEGER; -import org.mozilla.jss.pkix.cert.Certificate; -import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; -import org.mozilla.jss.asn1.BIT_STRING; - -import netscape.security.x509.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.certsrv.dbs.certdb.*; -import com.netscape.certsrv.logging.*; - -import com.netscape.cmsutil.ocsp.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java index 8576864e..ee60105c 100644 --- a/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java +++ b/pki/base/common/src/com/netscape/certsrv/ocsp/IOCSPStore.java @@ -18,12 +18,11 @@ package com.netscape.certsrv.ocsp; -import java.util.*; -import java.math.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.dbs.crldb.*; -import com.netscape.cmsutil.ocsp.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.cmsutil.ocsp.OCSPRequest; +import com.netscape.cmsutil.ocsp.OCSPResponse; /** diff --git a/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java b/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java index 5c814fd2..02cc5588 100644 --- a/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java +++ b/pki/base/common/src/com/netscape/certsrv/password/EPasswordCheckException.java @@ -17,9 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.password; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.PasswordResources; /** * A class represents a password checker exception. diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java b/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java index ef6c5af6..b745282b 100644 --- a/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java +++ b/pki/base/common/src/com/netscape/certsrv/pattern/AttrSetCollection.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.pattern; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Hashtable; + +import com.netscape.certsrv.base.IAttrSet; /** * This class represents a collection of attribute diff --git a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java b/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java index fe642630..d177f87b 100644 --- a/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java +++ b/pki/base/common/src/com/netscape/certsrv/pattern/Pattern.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.pattern; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java b/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java index a65e2e5f..95f54746 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/EPolicyException.java @@ -18,11 +18,10 @@ package com.netscape.certsrv.policy; -import java.io.*; -import java.util.*; -import java.text.*; -import java.lang.reflect.*; -import com.netscape.certsrv.base.*; +import java.util.Locale; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.MessageFormatter; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java b/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java index e5deb476..6bed58c5 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IExpression.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.policy; -import com.netscape.certsrv.base.*; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java index 0dac7106..ff30dc11 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.x509.GeneralName; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java index 5b33fc88..1f93719d 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java @@ -18,10 +18,11 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; +import java.util.Vector; + +import netscape.security.x509.GeneralName; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java index dbaa9739..e64187b8 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.x509.GeneralNames; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java index 51584fb9..64425856 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; +import java.util.Vector; + +import netscape.security.x509.GeneralNames; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java index 341c006f..834d462e 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java @@ -18,9 +18,12 @@ package com.netscape.certsrv.policy; -import java.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java index d7eeb1cf..d80a0d0c 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java @@ -18,11 +18,13 @@ package com.netscape.certsrv.policy; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.PolicyResult; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java b/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java index 1132b983..ea12f4b1 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/IPolicySet.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.policy; -import java.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.PolicyResult; +import java.util.Enumeration; + import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java b/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java index ca7b1f01..75df22de 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.policy; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java b/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java index f7c80f1f..c8bcec2c 100644 --- a/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java +++ b/pki/base/common/src/com/netscape/certsrv/policy/PolicyResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.policy; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java b/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java index 8593da16..fae38c69 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java @@ -17,15 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; -import netscape.security.x509.*; +import netscape.security.x509.X509CertInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.IConfigStore; public class CertInfoProfile { diff --git a/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java b/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java index 6c48fcb9..4c082608 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/EDeferException.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import com.netscape.certsrv.base.*; /** * This represents a profile specific exception. The diff --git a/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java b/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java index 197db3bc..f786df73 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/EProfileException.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** * This represents a generic profile exception. diff --git a/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java b/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java index 9a626ef2..e425c3f4 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/ERejectException.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import com.netscape.certsrv.base.*; /** * This represents a profile specific exception. This diff --git a/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java b/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java index c8af3275..bfd9bdc9 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/ICertInfoPolicyDefault.java @@ -17,14 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; +import netscape.security.x509.X509CertInfo; -import netscape.security.x509.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.request.IRequest; public interface ICertInfoPolicyDefault extends IPolicyDefault { diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java b/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java index f56f4716..fb92d53e 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IEnrollProfile.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.request.IRequest; /** * This interface represents an enrollment profile. diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java index cb368f9d..1af3ef19 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyConstraint.java @@ -18,10 +18,11 @@ package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java index 0aa8bb23..01805492 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IPolicyDefault.java @@ -18,10 +18,14 @@ package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java index 262d3eaf..c006db67 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfile.java @@ -17,12 +17,15 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; /** * This interface represents a profile. A profile contains diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java index 149cf33c..195078f7 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileAuthenticator.java @@ -17,11 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.authentication.IAuthManager; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java index aa849221..906c4816 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileContext.java @@ -17,9 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; /** * This interface represents a profile context which diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java index 20b9af97..8ce3262e 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileEx.java @@ -17,12 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; +import com.netscape.certsrv.base.EBaseException; /** * This interface represents the extension version of diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java index 1b6bea72..6d861579 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileInput.java @@ -17,10 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This interface represents a input policy which diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java index ad948464..b4654f40 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileOutput.java @@ -17,10 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.EPropertyException; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** * This interface represents a output policy which diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java index cf54a4ba..795a19c0 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileSubsystem.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java b/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java index a550b644..a36ee196 100644 --- a/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java +++ b/pki/base/common/src/com/netscape/certsrv/profile/IProfileUpdater.java @@ -17,10 +17,12 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.profile; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.request.*; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.property.IConfigTemplate; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; /** * This interface represents an updater that will be diff --git a/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java b/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java index a4b0ecb2..92aeff18 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java +++ b/pki/base/common/src/com/netscape/certsrv/property/Descriptor.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.property; -import java.util.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java b/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java index 3be0aa1e..7bd34dc5 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java +++ b/pki/base/common/src/com/netscape/certsrv/property/EPropertyException.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.property; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** * This is the base exception for property handling. diff --git a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java b/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java index c37d484b..f435db50 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java +++ b/pki/base/common/src/com/netscape/certsrv/property/IConfigTemplate.java @@ -18,7 +18,8 @@ package com.netscape.certsrv.property; -import java.util.*; +import java.util.Enumeration; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java b/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java index d3db4b49..271c1808 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java +++ b/pki/base/common/src/com/netscape/certsrv/property/IDescriptor.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.property; -import java.util.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java b/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java index c6d66b43..360477fe 100644 --- a/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java +++ b/pki/base/common/src/com/netscape/certsrv/property/PropertySet.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.property; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java b/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java index be33dc59..8b728208 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ECompSyntaxErr.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java index 16ad10b4..52799ba2 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/EMapperNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java index 6e0a9812..68e882f1 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/EMapperPluginNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java index f7198ede..2a3affcf 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/EPublisherNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java index 325207a3..c3b63ea1 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/EPublisherPluginNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java index 8294c677..a98b3a70 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ERuleNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java b/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java index ed1592aa..6bb2f7b0 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ERulePluginNotFound.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java b/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java index d7ac4804..cae75d2f 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ICRLPublisher.java @@ -18,8 +18,11 @@ package com.netscape.certsrv.publish; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; +import netscape.security.x509.X509CRLImpl; + +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/certsrv/publish/ILdapCertMapper.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java index 51252c55..cd4012a4 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapCertMapper.java @@ -18,11 +18,12 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import java.util.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import java.security.cert.X509Certificate; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java index 5fa54902..a15ea0ab 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapCrlMapper.java @@ -18,11 +18,12 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import java.security.cert.*; +import netscape.ldap.LDAPConnection; import netscape.security.x509.X509CRLImpl; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java index bc9cda99..26360fe8 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapExpression.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.request.IRequest; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java index 2201c1ba..0831717e 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapMapper.java @@ -18,12 +18,12 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import java.util.*; -import java.security.cert.*; -import com.netscape.certsrv.base.*; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.ldap.ELdapException; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java index 700e0c6d..b73b5ae2 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPlugin.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java index 42e33af5..e84b62fc 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPluginImpl.java @@ -18,9 +18,11 @@ package com.netscape.certsrv.publish; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IPluginImpl; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java index 6f4b5258..001d472b 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublishModule.java @@ -18,10 +18,8 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import java.security.cert.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java index 8b51a8f7..df6a1e3b 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapPublisher.java @@ -18,10 +18,11 @@ package com.netscape.certsrv.publish; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import java.util.Vector; + +import netscape.ldap.LDAPConnection; + +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java b/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java index cbefe9ed..bad8cbea 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/ILdapRule.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.publish; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import java.util.Vector; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java b/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java index 245771e7..6ff997a1 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/IPublishRuleSet.java @@ -18,13 +18,15 @@ package com.netscape.certsrv.publish; -import java.util.*; -import netscape.ldap.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.ldap.*; +import java.util.Enumeration; + +import netscape.ldap.LDAPConnection; + +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.request.IRequest; -import com.netscape.certsrv.ldap.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java b/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java index 445d0aa1..af19d2db 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/IPublisherProcessor.java @@ -18,24 +18,19 @@ package com.netscape.certsrv.publish; -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 netscape.ldap.*; -import java.security.cert.*; -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.dbs.certdb.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.ldap.ILdapConnModule; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.ldap.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java b/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java index f9a47a1c..ce72ed8a 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/IXcertPublisherProcessor.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java b/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java index 4444fc94..559cd8c0 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/LdapCertMapResult.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java b/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java index 56a8f92d..282db3cd 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/MapperPlugin.java @@ -18,11 +18,7 @@ package com.netscape.certsrv.publish; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; +import com.netscape.certsrv.base.Plugin; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java b/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java index 9a80083f..bd8ea741 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/MapperProxy.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java b/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java index 7408e9cb..d6864326 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/PublisherPlugin.java @@ -18,10 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.base.*; -import java.util.*; -import java.lang.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.Plugin; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java b/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java index 5a126cf9..06e08c31 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/PublisherProxy.java @@ -18,8 +18,6 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.publish.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java b/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java index 1de35590..8e515726 100644 --- a/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java +++ b/pki/base/common/src/com/netscape/certsrv/publish/RulePlugin.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.publish; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ldap.*; +import com.netscape.certsrv.base.Plugin; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java b/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java index 09b37e39..92ccd558 100644 --- a/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java +++ b/pki/base/common/src/com/netscape/certsrv/ra/IRAService.java @@ -18,20 +18,10 @@ package com.netscape.certsrv.ra; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IService; /** diff --git a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java b/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java index 9eb438c4..62fe529f 100644 --- a/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java @@ -18,19 +18,16 @@ package com.netscape.certsrv.ra; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; /** diff --git a/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java b/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java index 6d9f89d5..25f0922d 100644 --- a/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java +++ b/pki/base/common/src/com/netscape/certsrv/registry/ERegistryException.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.registry; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java b/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java index b7bdfbf2..774b3f9b 100644 --- a/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/registry/IPluginInfo.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.registry; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Locale; /** diff --git a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java b/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java index d567e8f4..0497562b 100644 --- a/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java +++ b/pki/base/common/src/com/netscape/certsrv/registry/IPluginRegistry.java @@ -18,8 +18,10 @@ package com.netscape.certsrv.registry; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java index a2704eed..3d327486 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java @@ -18,15 +18,16 @@ package com.netscape.certsrv.request; -import java.util.*; -import java.math.*; +import java.math.BigInteger; +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.apps.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.ldap.ILdapConnFactory; +import com.netscape.certsrv.ldap.ILdapConnModule; import com.netscape.certsrv.publish.IPublisherProcessor; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java b/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java index 5e41b54f..7eee1294 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java +++ b/pki/base/common/src/com/netscape/certsrv/request/AgentApproval.java @@ -19,7 +19,6 @@ package com.netscape.certsrv.request; import java.io.Serializable; - import java.util.Date; diff --git a/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java b/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java index 9bd7fa85..42ae2d2f 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java +++ b/pki/base/common/src/com/netscape/certsrv/request/AgentApprovals.java @@ -19,7 +19,6 @@ package com.netscape.certsrv.request; import java.io.Serializable; - import java.util.Date; import java.util.Enumeration; import java.util.Vector; diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java b/pki/base/common/src/com/netscape/certsrv/request/IRequest.java index f54352ce..c509e296 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequest.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequest.java @@ -20,16 +20,6 @@ package com.netscape.certsrv.request; //import java.io.Serializable; -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 netscape.security.x509.RevokedCertImpl; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateSubjectName; - import java.math.BigInteger; import java.util.Date; import java.util.Enumeration; @@ -37,6 +27,15 @@ import java.util.Hashtable; import java.util.Locale; import java.util.Vector; +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 com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.base.IAttrSet; + /** * An interface that defines abilities of request objects, diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java index 29adf3a0..a98cd747 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestListener.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.request; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; +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/certsrv/request/IRequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java index 7cf31557..01527b67 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.request; -import java.util.*; -import com.netscape.certsrv.request.*; +import java.util.Enumeration; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java index 9b2edf9b..468336b4 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestQueue.java @@ -17,11 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.request; -import java.math.*; -import java.util.Enumeration; -import com.netscape.certsrv.dbs.repository.IRepository; +import java.math.BigInteger; import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.dbs.repository.IRepository; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java index a04c6b34..696dc4e1 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestRecord.java @@ -19,9 +19,9 @@ package com.netscape.certsrv.request; import java.util.Enumeration; + import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.IDBObj; -import com.netscape.certsrv.request.RequestId; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java index ecb2e0fa..198092fc 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestScheduler.java @@ -20,11 +20,6 @@ package com.netscape.certsrv.request; //import java.io.Serializable; -import java.util.Date; -import java.util.Enumeration; - -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java b/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java index 17367bef..1fc0657f 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java +++ b/pki/base/common/src/com/netscape/certsrv/request/ldap/IRequestMod.java @@ -19,9 +19,8 @@ package com.netscape.certsrv.request.ldap; import java.util.Date; -import com.netscape.certsrv.request.RequestId; -import com.netscape.certsrv.request.RequestStatus; import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; /** * This interface defines how to update request record. diff --git a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java b/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java index 2e4c0a9e..ab910b37 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/security/ICryptoSubsystem.java @@ -18,17 +18,24 @@ package com.netscape.certsrv.security; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.*; -import org.mozilla.jss.CryptoManager.*; -import java.io.*; -import java.security.*; -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 java.io.IOException; +import java.security.KeyPair; +import java.security.cert.CertificateException; +import java.util.Locale; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.CryptoManager.NotInitializedException; +import org.mozilla.jss.crypto.ObjectNotFoundException; +import org.mozilla.jss.crypto.PQGParams; +import org.mozilla.jss.crypto.TokenException; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.NameValuePairs; /** diff --git a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java b/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java index af7030f0..984425a5 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java +++ b/pki/base/common/src/com/netscape/certsrv/security/IEncryptionUnit.java @@ -18,16 +18,12 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.X509Certificate; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; +import java.security.PublicKey; + import org.mozilla.jss.crypto.PrivateKey; +import com.netscape.certsrv.base.EBaseException; + /** * An interface represents a encryption unit. diff --git a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java b/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java index ac46a271..664d5c1f 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java +++ b/pki/base/common/src/com/netscape/certsrv/security/ISigningUnit.java @@ -18,13 +18,14 @@ package com.netscape.certsrv.security; -import java.security.*; -import org.mozilla.jss.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.util.*; -import org.mozilla.jss.crypto.Signature; -import com.netscape.certsrv.base.*; -import netscape.security.x509.*; +import java.security.PublicKey; + +import netscape.security.x509.X509CertImpl; + +import org.mozilla.jss.crypto.SignatureAlgorithm; +import org.mozilla.jss.crypto.X509Certificate; + +import com.netscape.certsrv.base.EBaseException; /** * A class represents the signing unit which is diff --git a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java b/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java index 0b484bdc..02ebc616 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java +++ b/pki/base/common/src/com/netscape/certsrv/security/IStorageKeyUnit.java @@ -18,16 +18,11 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.X509Certificate; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.crypto.*; -import org.mozilla.jss.crypto.PrivateKey; +import java.util.Enumeration; + +import org.mozilla.jss.crypto.CryptoToken; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/security/IToken.java b/pki/base/common/src/com/netscape/certsrv/security/IToken.java index 4211806f..0b79cfcf 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/IToken.java +++ b/pki/base/common/src/com/netscape/certsrv/security/IToken.java @@ -18,14 +18,7 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java b/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java index 1ad0e378..2edfa12a 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java +++ b/pki/base/common/src/com/netscape/certsrv/security/ITransportKeyUnit.java @@ -18,16 +18,13 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.io.*; -import java.net.*; -import java.security.*; -import java.security.cert.X509Certificate; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.base.*; -import org.mozilla.jss.crypto.*; +import java.security.PublicKey; + +import org.mozilla.jss.crypto.CryptoToken; import org.mozilla.jss.crypto.PrivateKey; +import org.mozilla.jss.crypto.SymmetricKey; + +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java b/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java index 87dd298f..513edfd4 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java +++ b/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java @@ -18,13 +18,18 @@ package com.netscape.certsrv.security; -import java.util.*; -import java.security.*; -import java.math.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import org.mozilla.jss.crypto.*; -import netscape.security.x509.*; +import java.math.BigInteger; +import java.security.KeyPair; +import java.util.Properties; + +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateExtensions; + +import org.mozilla.jss.crypto.SignatureAlgorithm; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.ConfigConstants; +import com.netscape.certsrv.common.Constants; /** * This class represents a container for storaging diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java b/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java index 69764649..14a9b66b 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/EDuplicateSelfTestException.java @@ -25,7 +25,6 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.base.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java b/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java index b38b574c..7761e54c 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/EInvalidSelfTestException.java @@ -25,7 +25,6 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.base.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java b/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java index 8c235328..111cb84b 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/EMissingSelfTestException.java @@ -25,7 +25,6 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.base.*; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java b/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java index 2124e5d4..b50072e9 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/ESelfTestException.java @@ -25,7 +25,7 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.EBaseException; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java b/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java index 783f8955..f881a285 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTest.java @@ -25,10 +25,10 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; +import java.util.Locale; + +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogEventListener; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java b/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java index a44626b6..3391bdd1 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/ISelfTestSubsystem.java @@ -25,10 +25,8 @@ package com.netscape.certsrv.selftests; // import statements // /////////////////////// -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.selftests.*; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogEventListener; ////////////////////// diff --git a/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java b/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java index 1c1551c5..c396c14b 100644 --- a/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java +++ b/pki/base/common/src/com/netscape/certsrv/selftests/SelfTestResources.java @@ -18,7 +18,7 @@ package com.netscape.certsrv.selftests; -import java.util.*; +import java.util.ListResourceBundle; /** diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgList.java b/pki/base/common/src/com/netscape/certsrv/template/ArgList.java index f3b955c2..72288a73 100644 --- a/pki/base/common/src/com/netscape/certsrv/template/ArgList.java +++ b/pki/base/common/src/com/netscape/certsrv/template/ArgList.java @@ -17,7 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.template; -import java.util.*; +import java.util.Vector; /** * This class represents a list of arguments diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java b/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java index ca8d866e..249bb442 100644 --- a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java +++ b/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java @@ -17,7 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.template; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; /** * This class represents a set of arguments. diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgString.java b/pki/base/common/src/com/netscape/certsrv/template/ArgString.java index b932a185..385338ca 100644 --- a/pki/base/common/src/com/netscape/certsrv/template/ArgString.java +++ b/pki/base/common/src/com/netscape/certsrv/template/ArgString.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.template; -import java.util.*; /** * This class represents a string-based argument. diff --git a/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java b/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java index dfaa04cc..0fec3043 100644 --- a/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java +++ b/pki/base/common/src/com/netscape/certsrv/tks/ITKSAuthority.java @@ -18,19 +18,8 @@ package com.netscape.certsrv.tks; -import java.io.*; -import java.net.*; -import java.util.*; -import java.math.*; -import java.security.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.util.*; - -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.request.*; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.request.IRequestQueue; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java index 6d8ec2b8..c5711725 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/Certificates.java @@ -18,8 +18,7 @@ package com.netscape.certsrv.usrgrp; -import java.security.*; -import java.security.cert.*; +import java.security.cert.X509Certificate; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java index db2aca24..6f094ab4 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/EUsrGrpException.java @@ -18,9 +18,7 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.logging.*; +import com.netscape.certsrv.base.EBaseException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java index 8644e4f6..a9d789e6 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/ICertUserLocator.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.usrgrp; -import netscape.ldap.*; -import java.util.*; -import com.netscape.certsrv.ldap.*; +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.ldap.ELdapException; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java index 3e36d9cc..778b9aab 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroup.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; +import java.util.Enumeration; + +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java index 2f7e10a7..2f8711ce 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IGroupConstants.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java index b34ba8f4..94bdf885 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IIdEvaluator.java @@ -18,9 +18,6 @@ package com.netscape.certsrv.usrgrp; -import java.util.*; -import java.security.*; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java index 59266fed..e575c58b 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUGSubsystem.java @@ -18,14 +18,12 @@ package com.netscape.certsrv.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.logging.*; +import java.security.cert.X509Certificate; +import java.util.Enumeration; + +import netscape.ldap.LDAPException; + +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java index febcb9e8..398ccb71 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUser.java @@ -18,10 +18,9 @@ package com.netscape.certsrv.usrgrp; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.base.*; -import java.security.cert.*; -import netscape.security.x509.*; +import java.security.cert.X509Certificate; + +import com.netscape.certsrv.base.IAttrSet; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java index 01a39249..f24e9fb4 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUserConstants.java @@ -18,7 +18,6 @@ package com.netscape.certsrv.usrgrp; -import com.netscape.certsrv.base.*; /** diff --git a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java index 98eb9e9b..17b00c88 100644 --- a/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java +++ b/pki/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java @@ -17,9 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.usrgrp; -import java.util.*; -import com.netscape.certsrv.base.*; -import netscape.ldap.*; +import netscape.ldap.LDAPException; /** * This interface defines the basic capabilities of diff --git a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java index b64ac462..4f68bf63 100644 --- a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java +++ b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java @@ -17,14 +17,14 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.util; -import netscape.ldap.*; -import java.io.*; -import java.net.*; -import javax.servlet.http.*; -import javax.servlet.*; -import java.util.*; -import java.math.*; -import java.util.regex.*; +import java.io.IOException; +import java.net.URL; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.servlet.http.HttpServletRequest; + +import netscape.ldap.LDAPDN; public class HttpInput { diff --git a/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java b/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java index 05a92f8d..c9881236 100644 --- a/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/util/IStatsSubsystem.java @@ -18,8 +18,9 @@ package com.netscape.certsrv.util; -import java.util.*; -import com.netscape.certsrv.base.*; +import java.util.Date; + +import com.netscape.certsrv.base.ISubsystem; /** diff --git a/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java b/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java index 2849f5ec..7c510b88 100644 --- a/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java +++ b/pki/base/common/src/com/netscape/certsrv/util/StatsEvent.java @@ -18,8 +18,8 @@ package com.netscape.certsrv.util; -import java.util.*; -import java.math.*; +import java.util.Enumeration; +import java.util.Vector; /** * A statistics transaction. |