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/cms/profile/common | |
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/cms/profile/common')
10 files changed, 179 insertions, 160 deletions
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java index aac1bb3c0..acaf9772a 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java @@ -18,17 +18,36 @@ package com.netscape.cms.profile.common; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.registry.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthSubsystem; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileAuthenticator; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; +import com.netscape.certsrv.profile.IProfileSubsystem; +import com.netscape.certsrv.profile.IProfileUpdater; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.registry.IPluginInfo; +import com.netscape.certsrv.registry.IPluginRegistry; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java index d525689bd..681f2b4a5 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/CACertCAEnrollProfile.java @@ -18,31 +18,15 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; - - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfileEx; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java index c3b2a5ddc..32cd51b5f 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/CAEnrollProfile.java @@ -18,29 +18,28 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import java.util.Enumeration; + +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.ca.ICAService; +import com.netscape.certsrv.ca.ICertificateAuthority; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.logging.AuditFormat; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IProfileUpdater; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java index cc8789390..95c360f8c 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java @@ -18,33 +18,87 @@ package com.netscape.cms.profile.common; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; -import com.netscape.cmsutil.util.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.Attribute; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.primitive.AVA; -import org.mozilla.jss.pkix.crmf.*; -import org.mozilla.jss.pkix.cmc.*; -import org.mozilla.jss.pkcs10.*; +import java.util.Date; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Locale; +import java.util.StringTokenizer; + +import netscape.security.pkcs.PKCS10; +import netscape.security.pkcs.PKCS10Attribute; +import netscape.security.pkcs.PKCS10Attributes; +import netscape.security.pkcs.PKCS9Attribute; +import netscape.security.util.DerInputStream; +import netscape.security.util.DerOutputStream; +import netscape.security.util.DerValue; +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.CertificateSubjectName; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.Extension; +import netscape.security.x509.Extensions; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + import org.mozilla.jss.CryptoManager; +import org.mozilla.jss.asn1.ASN1Util; +import org.mozilla.jss.asn1.ASN1Value; +import org.mozilla.jss.asn1.INTEGER; +import org.mozilla.jss.asn1.InvalidBERException; +import org.mozilla.jss.asn1.OBJECT_IDENTIFIER; +import org.mozilla.jss.asn1.OCTET_STRING; +import org.mozilla.jss.asn1.SEQUENCE; +import org.mozilla.jss.asn1.SET; import org.mozilla.jss.crypto.CryptoToken; +import org.mozilla.jss.pkcs10.CertificationRequest; +import org.mozilla.jss.pkcs10.CertificationRequestInfo; +import org.mozilla.jss.pkix.cmc.LraPopWitness; +import org.mozilla.jss.pkix.cmc.OtherMsg; +import org.mozilla.jss.pkix.cmc.PKIData; +import org.mozilla.jss.pkix.cmc.TaggedAttribute; +import org.mozilla.jss.pkix.cmc.TaggedCertificationRequest; +import org.mozilla.jss.pkix.cmc.TaggedRequest; +import org.mozilla.jss.pkix.crmf.CertReqMsg; +import org.mozilla.jss.pkix.crmf.CertRequest; +import org.mozilla.jss.pkix.crmf.CertTemplate; +import org.mozilla.jss.pkix.crmf.PKIArchiveOptions; +import org.mozilla.jss.pkix.crmf.ProofOfPossession; +import org.mozilla.jss.pkix.primitive.AVA; +import org.mozilla.jss.pkix.primitive.Attribute; +import org.mozilla.jss.pkix.primitive.Name; +import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authentication.IAuthToken; +import com.netscape.certsrv.authentication.ISharedToken; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.EPropertyNotFound; +import com.netscape.certsrv.base.SessionContext; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.profile.EDeferException; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IEnrollProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.cmsutil.util.HMACDigest; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java index dd994e83a..199aa7943 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfileContext.java @@ -18,10 +18,7 @@ package com.netscape.cms.profile.common; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.profile.*; +import com.netscape.certsrv.profile.IProfileContext; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java b/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java index 12bbaa783..147d9c820 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/ProfileContext.java @@ -18,9 +18,9 @@ package com.netscape.cms.profile.common; -import java.util.*; +import java.util.Hashtable; -import com.netscape.certsrv.profile.*; +import com.netscape.certsrv.profile.IProfileContext; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java b/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java index bf9594fa7..a0f0ed250 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/ProfilePolicy.java @@ -18,7 +18,9 @@ package com.netscape.cms.profile.common; -import com.netscape.certsrv.profile.*; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfilePolicy; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java index cd980c5c2..f82e73138 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/RAEnrollProfile.java @@ -18,28 +18,22 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.ra.*; -import com.netscape.certsrv.apps.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import java.util.Enumeration; + +import netscape.security.x509.X500Name; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.connector.IConnector; +import com.netscape.certsrv.profile.EProfileException; +import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.ra.IRAService; +import com.netscape.certsrv.ra.IRegistrationAuthority; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.IRequestListener; +import com.netscape.certsrv.request.IRequestQueue; +import com.netscape.certsrv.request.RequestStatus; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java index c83f05746..4a18ff14d 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/ServerCertCAEnrollProfile.java @@ -18,30 +18,15 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfileEx; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; /** diff --git a/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java index a6acf111e..7d4254bff 100644 --- a/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java +++ b/pki/base/common/src/com/netscape/cms/profile/common/UserCertCAEnrollProfile.java @@ -18,30 +18,15 @@ package com.netscape.cms.profile.common; -import java.security.cert.*; -import java.math.*; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.connector.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.ca.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.authentication.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.logging.*; - -import netscape.security.x509.*; -import netscape.security.util.*; -import netscape.security.pkcs.*; - -import java.security.*; -import org.mozilla.jss.asn1.*; -import org.mozilla.jss.pkix.primitive.*; -import org.mozilla.jss.pkix.crmf.*; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.common.NameValuePairs; +import com.netscape.certsrv.profile.IPolicyConstraint; +import com.netscape.certsrv.profile.IPolicyDefault; +import com.netscape.certsrv.profile.IProfileEx; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.profile.IProfileOutput; +import com.netscape.certsrv.profile.IProfilePolicy; /** |