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

11 files changed, 147 insertions, 136 deletions

diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
index 16039767d..6fe802e72 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java
@@ -18,26 +18,25 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
-import java.security.cert.CertificateException;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
+import java.io.IOException;
+import java.util.Locale;
+
+import netscape.security.extensions.AuthInfoAccessExtension;
+import netscape.security.util.ObjectIdentifier;
 import netscape.security.x509.Extension;
-import netscape.security.x509.X500Name;
-import netscape.security.x509.URIName;
 import netscape.security.x509.GeneralName;
-import netscape.security.util.ObjectIdentifier;
-import com.netscape.certsrv.ca.*;
-import netscape.security.extensions.AuthInfoAccessExtension;
-import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.base.IExtendedPluginInfo;
+import netscape.security.x509.URIName;
+import netscape.security.x509.X500Name;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.EPropertyNotFound;
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
index 5abd0de5d..4cdb0bdc0 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java
@@ -18,19 +18,30 @@
 package com.netscape.cms.crl;
 
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateParsingException;
-import netscape.security.x509.*;
+import java.util.Locale;
+
+import netscape.security.x509.AuthorityKeyIdentifierExtension;
+import netscape.security.x509.CertificateExtensions;
+import netscape.security.x509.Extension;
+import netscape.security.x509.GeneralNames;
+import netscape.security.x509.KeyIdentifier;
+import netscape.security.x509.PKIXExtensions;
+import netscape.security.x509.SerialNumber;
+import netscape.security.x509.SubjectKeyIdentifierExtension;
+import netscape.security.x509.X509CertImpl;
+import netscape.security.x509.X509CertInfo;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.authority.*;
 import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
+import com.netscape.certsrv.ca.ICertificateAuthority;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.ca.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
index 578faaa52..e4bb4cb68 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java
@@ -18,20 +18,21 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
 import java.math.BigInteger;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
-import netscape.security.x509.Extension;
+import java.util.Locale;
+
 import netscape.security.x509.CRLNumberExtension;
+import netscape.security.x509.Extension;
+import netscape.security.x509.PKIXExtensions;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.ca.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
index c8c70138b..245428a6d 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java
@@ -18,21 +18,20 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
-import java.math.BigInteger;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
-import netscape.security.x509.Extension;
+import java.io.IOException;
+import java.util.Locale;
+
 import netscape.security.x509.CRLReasonExtension;
+import netscape.security.x509.Extension;
+import netscape.security.x509.PKIXExtensions;
 import netscape.security.x509.RevocationReason;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.ca.*;
 import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
index 2bde395a6..601e15d2f 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java
@@ -18,25 +18,25 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
-import java.math.BigInteger;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
+import java.io.IOException;
+import java.util.Locale;
+
+import netscape.security.x509.CertificateIssuerExtension;
 import netscape.security.x509.Extension;
-import netscape.security.x509.X500Name;
-import netscape.security.x509.URIName;
-import com.netscape.certsrv.ca.*;
 import netscape.security.x509.GeneralNames;
-import netscape.security.x509.CertificateIssuerExtension;
-import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.base.IExtendedPluginInfo;
+import netscape.security.x509.PKIXExtensions;
+import netscape.security.x509.URIName;
+import netscape.security.x509.X500Name;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.EPropertyNotFound;
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 /**
  * This represents a certificate issuer extension.
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
index f263e0257..35d21e5c7 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java
@@ -18,20 +18,21 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
 import java.math.BigInteger;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
-import netscape.security.x509.Extension;
+import java.util.Locale;
+
 import netscape.security.x509.DeltaCRLIndicatorExtension;
+import netscape.security.x509.Extension;
+import netscape.security.x509.PKIXExtensions;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.ca.*;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
index 3f500b464..86bdd05e2 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java
@@ -18,29 +18,27 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
-import java.math.BigInteger;
-import java.security.cert.CertificateException;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
+import java.io.IOException;
+import java.util.Locale;
+
+import netscape.security.x509.CRLDistributionPoint;
 import netscape.security.x509.Extension;
-import netscape.security.x509.X500Name;
-import netscape.security.x509.URIName;
-import com.netscape.certsrv.ca.*;
+import netscape.security.x509.FreshestCRLExtension;
 import netscape.security.x509.GeneralNames;
 import netscape.security.x509.GeneralNamesException;
-import netscape.security.x509.CRLDistributionPoint;
-import netscape.security.x509.FreshestCRLExtension;
-import netscape.security.util.BitArray;
-import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.base.IExtendedPluginInfo;
+import netscape.security.x509.PKIXExtensions;
+import netscape.security.x509.URIName;
+import netscape.security.x509.X500Name;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.EPropertyNotFound;
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
index df0e9e350..e0e39b8a6 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
@@ -18,22 +18,23 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
+import java.io.IOException;
+import java.util.Locale;
+
+import netscape.security.util.ObjectIdentifier;
 import netscape.security.x509.Extension;
 import netscape.security.x509.HoldInstructionExtension;
-import netscape.security.util.ObjectIdentifier;
-import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.base.IExtendedPluginInfo;
+import netscape.security.x509.PKIXExtensions;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.EPropertyNotFound;
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.ca.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
index d1dfce9df..c0c622447 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java
@@ -18,20 +18,20 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
 import java.util.Date;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
+import java.util.Locale;
+
 import netscape.security.x509.Extension;
 import netscape.security.x509.InvalidityDateExtension;
+import netscape.security.x509.PKIXExtensions;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.ca.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
index cf66e9d76..9ca9d5d2a 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
@@ -18,33 +18,34 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
-import java.math.BigInteger;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
-import netscape.security.x509.Extension;
-import netscape.security.x509.X500Name;
-import netscape.security.x509.URIName;
-import netscape.security.x509.OIDName;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Locale;
+
+import netscape.security.util.DerValue;
+import netscape.security.util.ObjectIdentifier;
 import netscape.security.x509.DNSName;
-import netscape.security.x509.RFC822Name;
 import netscape.security.x509.EDIPartyName;
-import netscape.security.x509.IPAddressName;
+import netscape.security.x509.Extension;
 import netscape.security.x509.GeneralName;
 import netscape.security.x509.GeneralNames;
+import netscape.security.x509.IPAddressName;
 import netscape.security.x509.IssuerAlternativeNameExtension;
-import netscape.security.util.DerValue;
-import netscape.security.util.ObjectIdentifier;
-import com.netscape.certsrv.ca.*;
-import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.base.IExtendedPluginInfo;
+import netscape.security.x509.OIDName;
+import netscape.security.x509.PKIXExtensions;
+import netscape.security.x509.RFC822Name;
+import netscape.security.x509.URIName;
+import netscape.security.x509.X500Name;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.EPropertyNotFound;
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
index f273c3201..ccc5b64d0 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java
@@ -18,30 +18,30 @@
 package com.netscape.cms.crl;
 
 
-import java.io.*;
-import java.util.*;
-import java.math.BigInteger;
-import java.security.cert.CertificateException;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CRLExtensions;
+import java.io.IOException;
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import netscape.security.util.BitArray;
 import netscape.security.x509.Extension;
-import netscape.security.x509.X500Name;
-import netscape.security.x509.URIName;
-import com.netscape.certsrv.ca.*;
-import netscape.security.x509.RDN;
 import netscape.security.x509.GeneralNames;
 import netscape.security.x509.GeneralNamesException;
 import netscape.security.x509.IssuingDistributionPoint;
 import netscape.security.x509.IssuingDistributionPointExtension;
-import netscape.security.util.BitArray;
-import com.netscape.certsrv.base.IConfigStore;
-import com.netscape.certsrv.base.IExtendedPluginInfo;
+import netscape.security.x509.PKIXExtensions;
+import netscape.security.x509.RDN;
+import netscape.security.x509.URIName;
+import netscape.security.x509.X500Name;
+
+import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.EPropertyNotFound;
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.base.IExtendedPluginInfo;
+import com.netscape.certsrv.ca.ICMSCRLExtension;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
 import com.netscape.certsrv.common.NameValuePairs;
-import com.netscape.certsrv.dbs.crldb.*;
-import com.netscape.certsrv.logging.*;
-import com.netscape.certsrv.apps.*;
+import com.netscape.certsrv.logging.ILogger;
 
 
 /**