Cleanup imports

Automated changes done by Eclipse
Minor tweak to one file where Eclipse was tring to find an import for Any
Due to finding it in an annotated comment.

https://bugzilla.redhat.com/show_bug.cgi?id=728303

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2292 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

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 38d8aee72..56e53080d 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 c58572400..12e38ef41 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 d193365ce..878fe1639 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 e982b1bb2..8bae56eb0 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 9036a3652..892bd490a 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 1646e22ff..f91ef38bb 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 376dce8b0..8136c0b39 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 060ab7dcb..506a5e33f 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 15224c00c..5e2231921 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 e363f01d2..dfaad21d0 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 cb6e3e4ce..f060db5f2 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 5bf52f1b8..138a07ebb 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 4ff2c6a7f..7d2d5eb9d 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 bb04f0698..eb36f9965 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 c82fa72a8..b2f7d69ad 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 0b91fa675..29657e7a4 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 f8cb47ec6..a8462108e 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 0f024ea64..d4bdf7bb1 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 b0806eb65..eae65d176 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 95fc6bf55..5916ecd03 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 02001338b..94d6df40e 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 ef8c62f8f..b9d9bb96c 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 f17038eff..7cb5240a5 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 dc64d322a..2cb6e80b0 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 db016f248..167911c40 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 2d0f81ee8..f6fc3547f 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 f8a69f65d..f54f13772 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 50ea8fdc7..3960d58fd 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 b74131a68..a0399d349 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 835ad0ed1..83c8f85fa 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 2006c8f23..91f9f51af 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 902c0aad3..c770121fd 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 dc3186497..fc4e8c291 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 b53e7c66f..1793ff23c 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 00f9c8460..73e95b776 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 ac98c6c36..e8060b24a 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 a32dfc2ea..4a55af607 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 4c9626806..1fba48f19 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 a9cdbbf33..3902d4433 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 7a500bde6..fb8628ba2 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 d23895088..77f1708ac 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 ad89cc72b..23b82179e 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 86ca5912e..f1e3e25e4 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 634b5d90e..17efca771 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 796c4255b..16324fb91 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 fc8c8ec8a..e01d40f88 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 7db522547..3fd0d6a63 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 e1d992e40..470ba654c 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 e0cfe429b..287ce795d 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 0b7d7ee86..e7001ce56 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 79d429d71..5716e6e17 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 912d48f69..4510c46b4 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 1d60e3b07..7b05bb6ac 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 d4a4c1278..cac6fc757 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 3470b206d..edaea59c4 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 6e6a47c9f..f6df2226f 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 97f9792fb..82e0961c1 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 bc545a9ba..6f7a49615 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 81d5cbefb..653c684f5 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 139585f2c..ff83cadd5 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 b4fecd155..1542d5faf 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 92466d30d..44d55e32e 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 a2530521a..678ccfee2 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 e89c14f57..6dcca9d2a 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 a52d90e94..c53c6f09d 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 610ab30ed..6ee57059c 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 83241170a..5cb53e255 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 593261d9e..57ce9700f 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 90dcbaa26..a97936aaa 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 b9305816e..3574c3a5b 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 54e65ce30..4bfb14fb0 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 b0fa4bff0..335da55a2 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 d7b82f25d..7d851b747 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 1616e7418..4be6c3409 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 faf18a342..4270c9ced 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 09364dc69..34df47c97 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 71356eb4f..ab90866b1 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 e82a3a14c..350a29c48 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 93b1f87fb..8e627520c 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 d43145d8b..75702199e 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 d31ccd468..1a0783655 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 3a28b1337..9be75f0bb 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 0e3108182..4a5592c0b 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 febb684cc..681e586b6 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 cc8c38187..a77458880 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 c036909de..b913a18c6 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 15e396943..2086cacb1 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 f0d98fd59..991a952aa 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 ffac9b37b..ba245bcfb 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 f795ff9a6..0edcc1877 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 aced5cc1f..2bc9f57b9 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 324a7df17..093bea255 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 a6b7fa031..d6e2fafb4 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 e92d13a16..660b6e9e8 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 7ee01b3f1..5ff902413 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 5e6db669f..326ea4664 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 5764f4005..8c2914479 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 297b44262..e76523760 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 b50638ddc..4d7ee06c2 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 55f348b11..fb4bb1f77 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 37528c603..cbcddb39a 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 410629982..1c3842bf5 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 9e6d2b4de..1e238f60a 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 d30ccbf35..fefa8cc95 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 d610ee909..33b7e7f2a 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 00c057902..9bc828262 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 7992d5fb0..7f67f7a68 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 b2d02f2a3..b268073e0 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 5fe5a4025..5785aeb06 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 571380eaf..1b484b666 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 74f66992b..40e0ee171 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 5fe06f921..5a9fb1195 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 3f829aa31..a6907c008 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 13cadf2ab..46082c73a 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 71b810709..ef3e17424 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 8ac2cd505..f706c2ecf 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 f56bf4d3e..4cffbe458 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 3cf762663..8d912fc55 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 79a8aecb4..261497380 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 40dad6eb9..1dae27287 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 83f6bd68d..b0cb173cb 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 7fae366d8..199941be9 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 8fa1249f6..415b35d0f 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 750e35807..146824ac4 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 c45b5d129..c18b062c2 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 d15033657..12f5ede2c 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 fc9540e55..44a4283bd 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 b0fd0ce18..f94f20a95 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 e970d4182..12c09b0bc 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 65d4136c7..878b9ba16 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 82bde43f4..438c42508 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 b4a7070a7..01fbc6b93 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 30ee30836..b8195eece 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 942b570db..6a7472ff1 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 ea97fe3d6..7b87d67bd 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 648d3b18c..f59a10df6 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 a5347ff43..cc2687bc3 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 234c7a46d..9d7ee46f0 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 6b654da40..49d0851ed 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 2382412c4..d1a6889cc 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 74c97402b..bcda466d1 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 4301f5327..c5375caed 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 e9cdbdfa1..40d9e80e3 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 a9c24fdc1..82c5821b5 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 84b223a88..b99f6241c 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 9bd9ba027..8ca8b2f02 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 8576864e8..ee60105ce 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 5c814fd2e..02cc55885 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 ef6c5af66..b745282b6 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 fe6426306..d177f87b1 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 a65e2e5ff..95f547468 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 e5deb476a..6bed58c5d 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 0dac71068..ff30dc11b 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 5b33fc888..1f93719d3 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 dbaa97394..e64187b86 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 51584fb96..644258567 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 341c006f0..834d462e0 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 d7eeb1cfb..d80a0d0c2 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 1132b9831..ea12f4b1b 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 ca7b1f01e..75df22de1 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 f7c80f1f8..c8bcec2ce 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 8593da163..fae38c696 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 6c48fcb91..4c082608d 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 197db3bcf..f786df730 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 9a626ef22..e425c3f42 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 c8af3275c..bfd9bdc95 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 f56f47160..fb92d53ee 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 cb368f9da..1af3ef190 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 0aa8bb234..018054926 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 262d3eafb..c006db679 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 149cf33c2..195078f7b 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 aa8492210..906c4816e 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 20b9af977..8ce3262ec 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 1b6bea720..6d861579c 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 ad9484648..b4654f408 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 cf54a4ba4..795a19c0e 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 a550b6445..a36ee1969 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 a4b0ecb2d..92aeff185 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 3be0aa1ea..7bd34dc51 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 c37d484b8..f435db50c 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 d3db4b494..271c1808a 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 c6d66b43b..360477fe9 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 be33dc599..8b7282081 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 16ad10b4d..52799ba26 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 6e0a98121..68e882f18 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 f7198edef..2a3affcf7 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 325207a32..c3b63ea1e 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 8294c6772..a98b3a706 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 ed1592aab..6bb2f7b05 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 d7ac48046..cae75d2f8 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 51252c55a..cd4012a45 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 5fa549025..a15ea0abc 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 bc9cda999..26360fe89 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 2201c1bad..0831717e9 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 700e0c6de..b73b5ae28 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 42e33af5d..e84b62fc1 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 6f4b52586..001d472bc 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 8b51a8f79..df6a1e3b2 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 cbefe9ed6..bad8cbea8 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 245771e75..6ff997a1d 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 445d0aa15..af19d2dbc 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 f9a47a1c5..ce72ed8ab 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 4444fc947..559cd8c0c 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 56a8f92dd..282db3cd8 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 9a80083f6..bd8ea7418 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 7408e9cbf..d68643268 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 5a126cf9b..06e08c31e 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 1de355906..8e5157262 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 09b37e39c..92ccd5587 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 9eb438c4f..62fe529f0 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 6d9f89d5d..25f0922dd 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 b7bdfbf2c..774b3f9ba 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 d567e8f46..0497562be 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 a2704eed1..3d3274869 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 5e41b54f2..7eee12940 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 9bd7fa857..42ae2d2f4 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 f54352ce1..c509e2966 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 29adf3a0f..a98cd747e 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 7cf31557f..01527b672 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 9b2edf9b4..468336b4f 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 a04c6b342..696dc4e16 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 ecb2e0fa3..198092fc1 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 17367befd..1fc0657f6 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 2e4c0a9ee..ab910b376 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 af7030f06..984425a52 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 ac46a271d..664d5c1f8 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 0b484bdc7..02ebc616b 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 4211806fc..0b79cfcf3 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 1ad0e378c..2edfa12a9 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 87dd298f7..513edfd42 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 697646493..14a9b66bd 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 b38b574cf..7761e54cf 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 8c2353287..111cb84bb 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 2124e5d4a..b50072e97 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 783f8955d..f881a285e 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 a44626b64..3391bdd1d 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 1c1551c5a..c396c14b1 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 f3b955c27..72288a73c 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 ca8d866ea..249bb4420 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 b932a1855..385338ca9 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 dfaa04cc4..0fec3043f 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 6d8ec2b8f..c57117251 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 db2aca24c..6f094ab44 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 8644e4f6f..a9d789e65 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 3e36d9cc2..778b9aab2 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 2f7e10a71..2f8711ceb 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 b34ba8f4a..94bdf8857 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 59266fedc..e575c58bd 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 febcb9e84..398ccb71e 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 01a392494..f24e9fb4f 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 98eb9e9b5..17b00c883 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 b64ac4622..4f68bf635 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 05a92f8d4..c98812369 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 2849f5ecc..7c510b889 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.