diff options
author | admiyo <admiyo@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-11-04 19:48:54 +0000 |
---|---|---|
committer | admiyo <admiyo@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-11-04 19:48:54 +0000 |
commit | 4f97d6f686b00237d06bd34c70f8cad5abbff74d (patch) | |
tree | 29f460096a3e1db43ae16e8b1c6713d6047d15dc /pki/base/common/src/com/netscape/cmscore/cert | |
parent | 5b4ff55e683c897a7b48fed2717bb0e7e7049b21 (diff) | |
download | pki-4f97d6f686b00237d06bd34c70f8cad5abbff74d.tar.gz pki-4f97d6f686b00237d06bd34c70f8cad5abbff74d.tar.xz pki-4f97d6f686b00237d06bd34c70f8cad5abbff74d.zip |
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
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/cert')
13 files changed, 148 insertions, 110 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java b/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java index 9b6c3dfe0..ed20d76f3 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertDateCompare.java @@ -18,8 +18,10 @@ package com.netscape.cmscore.cert; -import java.util.*; -import netscape.security.x509.*; +import java.util.Comparator; +import java.util.Date; + +import netscape.security.x509.X509CertImpl; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java index 882a38c0c..3168b92f2 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertPrettyPrint.java @@ -18,15 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.PublicKey; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; +import java.security.cert.Certificate; + +import com.netscape.certsrv.base.ICertPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java index 6731ae35d..5a49d06e8 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java @@ -18,28 +18,51 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.math.*; -import java.security.cert.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.osutil.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.logging.ILogger; - +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import netscape.security.pkcs.*; -import java.net.SocketException; +import java.security.cert.Certificate; +import java.security.cert.CertificateEncodingException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.X509CRL; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Date; +import java.util.StringTokenizer; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS7; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateIssuerName; +import netscape.security.x509.CertificateSerialNumber; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CRLImpl; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; -import javax.servlet.http.HttpServletRequest; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.CryptoManager.CertificateUsage; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.osutil.OSUtil; + /** * Utility class with assorted methods to check for * smime pairs, determining the type of cert - signature diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java index 979e0fdd8..effd86edd 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java @@ -18,12 +18,20 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.security.cert.*; -import org.mozilla.jss.asn1.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.ca.*; +import java.io.IOException; +import java.io.OutputStream; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import org.mozilla.jss.asn1.ANY; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.Tag; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.cert.ICrossCertPairSubsystem; diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java index 693d881c5..232035250 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrlCachePrettyPrint.java @@ -18,15 +18,21 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.ca.*; +import java.text.DateFormat; +import java.util.Iterator; +import java.util.Locale; +import java.util.ResourceBundle; +import java.util.Set; +import java.util.TimeZone; -import com.netscape.certsrv.apps.*; +import netscape.security.x509.CRLExtensions; +import netscape.security.x509.Extension; +import netscape.security.x509.RevokedCertImpl; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.ICRLPrettyPrint; +import com.netscape.certsrv.ca.ICRLIssuingPoint; +import com.netscape.certsrv.ca.ICertificateAuthority; /** * This class will display the certificate content in predefined diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java index 2f7c08dee..1a3969b4e 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrlPrettyPrint.java @@ -18,15 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.util.*; -import java.security.*; +import netscape.security.x509.X509CRLImpl; + +import com.netscape.certsrv.base.ICRLPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java index 41020abd1..663585bf0 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java @@ -18,22 +18,34 @@ package com.netscape.cmscore.cert; -import netscape.ldap.*; -import java.awt.*; -import java.io.*; -import java.util.*; -import java.security.cert.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.ldap.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.cert.*; -import com.netscape.certsrv.publish.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.dbs.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.ldapconn.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; +import java.util.Enumeration; + +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPModification; +import netscape.ldap.LDAPModificationSet; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.cert.ICrossCertPairSubsystem; +import com.netscape.certsrv.ldap.ELdapException; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.publish.IPublisherProcessor; +import com.netscape.certsrv.publish.IXcertPublisherProcessor; +import com.netscape.cmscore.ldapconn.LdapBoundConnFactory; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java index 09aea0aca..ea9fabf24 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/ExtPrettyPrint.java @@ -18,17 +18,9 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.math.BigInteger; -import netscape.security.util.*; -import netscape.security.extensions.*; -import netscape.security.x509.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.base.*; -import java.security.*; -import netscape.security.x509.CRLDistributionPointsExtension.Reason; +import netscape.security.x509.Extension; + +import com.netscape.certsrv.base.IExtPrettyPrint; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java index 7fd33f95f..b340ea236 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/OidLoaderSubsystem.java @@ -18,15 +18,25 @@ package com.netscape.cmscore.cert; -import java.awt.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; -import netscape.security.util.ObjectIdentifier; import java.security.cert.CertificateException; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; + +import netscape.security.extensions.CertificateRenewalWindowExtension; +import netscape.security.extensions.CertificateScopeOfUseExtension; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.DeltaCRLIndicatorExtension; +import netscape.security.x509.FreshestCRLExtension; +import netscape.security.x509.HoldInstructionExtension; +import netscape.security.x509.InvalidityDateExtension; +import netscape.security.x509.IssuingDistributionPointExtension; +import netscape.security.x509.OIDMap; + +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java index 550756f31..3ace3c67b 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintFormat.java @@ -18,10 +18,7 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import com.netscape.certsrv.base.*; +import com.netscape.certsrv.base.IPrettyPrintFormat; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java index 026dbfcbc..4bf1147ac 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PrettyPrintResources.java @@ -18,9 +18,10 @@ package com.netscape.cmscore.cert; -import java.util.*; -import netscape.security.x509.*; -import netscape.security.extensions.*; +import java.util.ListResourceBundle; + +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.KeyUsageExtension; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java b/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java index 1f2d16136..01e58fa15 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/PubKeyPrettyPrint.java @@ -18,15 +18,7 @@ package com.netscape.cmscore.cert; -import java.io.*; -import java.util.*; -import java.text.*; -import java.security.cert.*; -import netscape.security.util.*; -import netscape.security.x509.*; -import netscape.security.provider.RSAPublicKey; -import com.netscape.cmscore.util.*; -import java.security.*; +import java.security.PublicKey; /** diff --git a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java index 0efc09d33..539ec82b0 100644 --- a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java @@ -18,15 +18,22 @@ package com.netscape.cmscore.cert; -import java.awt.*; -import java.io.*; -import java.util.*; -import com.netscape.certsrv.base.*; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.apps.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; + +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVAValueConverter; +import netscape.security.x509.DirStrConverter; +import netscape.security.x509.X500NameAttrMap; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmscore.util.Debug; /** |