diff options
Diffstat (limited to 'base')
74 files changed, 208 insertions, 293 deletions
diff --git a/base/ca/src/com/netscape/ca/CAPolicy.java b/base/ca/src/com/netscape/ca/CAPolicy.java index fa41a961a..dda7e52d5 100644 --- a/base/ca/src/com/netscape/ca/CAPolicy.java +++ b/base/ca/src/com/netscape/ca/CAPolicy.java @@ -39,7 +39,6 @@ import com.netscape.cmscore.util.Debug; * XXX2 moved to just implement IPolicy since GenericPolicyProcessor is * unuseable for CA. * - * @deprecated * @version $Revision$, $Date$ */ public class CAPolicy implements IPolicy { diff --git a/base/ca/src/com/netscape/ca/CertificateAuthority.java b/base/ca/src/com/netscape/ca/CertificateAuthority.java index ae90d3ac1..6a1f9b679 100644 --- a/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -440,9 +440,6 @@ public class CertificateAuthority return mCRLPublisher; } - /** - * @deprecated - */ public IPolicyProcessor getPolicyProcessor() { return mPolicy.getPolicyProcessor(); } diff --git a/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java b/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java index 5218a4cb1..3389d1da9 100644 --- a/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java +++ b/base/common/src/com/netscape/certsrv/ca/ICertificateAuthority.java @@ -132,7 +132,6 @@ public interface ICertificateAuthority extends ISubsystem { /** * Retrieves the policy processor of this certificate authority. - * @deprecated * @return CA's policy processor */ public IPolicyProcessor getPolicyProcessor(); diff --git a/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java b/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java index 0ecd7a7b0..070a16c5c 100644 --- a/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java +++ b/base/common/src/com/netscape/certsrv/kra/IKeyRecoveryAuthority.java @@ -207,7 +207,6 @@ public interface IKeyRecoveryAuthority extends ISubsystem { /** * Returns policy processor of the key recovery * authority. - * @deprecated * @return policy processor */ public IPolicyProcessor getPolicyProcessor(); diff --git a/base/common/src/com/netscape/certsrv/policy/EPolicyException.java b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java index b5a46736e..1026bfb6a 100644 --- a/base/common/src/com/netscape/certsrv/policy/EPolicyException.java +++ b/base/common/src/com/netscape/certsrv/policy/EPolicyException.java @@ -35,7 +35,6 @@ import com.netscape.certsrv.base.MessageFormatter; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ * @see java.text.MessageFormat */ diff --git a/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java b/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java index 96da142ba..ce746a6f9 100644 --- a/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IEnrollmentPolicy.java @@ -28,7 +28,6 @@ package com.netscape.certsrv.policy; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IEnrollmentPolicy extends IPolicyRule { diff --git a/base/common/src/com/netscape/certsrv/policy/IExpression.java b/base/common/src/com/netscape/certsrv/policy/IExpression.java index 9bfe34611..b6640b37d 100644 --- a/base/common/src/com/netscape/certsrv/policy/IExpression.java +++ b/base/common/src/com/netscape/certsrv/policy/IExpression.java @@ -28,7 +28,6 @@ import com.netscape.certsrv.request.IRequest; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IExpression { diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java index 1e8a66666..330e935f6 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameAsConstraintsConfig.java @@ -31,7 +31,6 @@ import netscape.security.x509.GeneralName; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IGeneralNameAsConstraintsConfig { diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java index f4f7362cc..1e5d0e6b5 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameConfig.java @@ -19,10 +19,10 @@ package com.netscape.certsrv.policy; import java.util.Vector; -import netscape.security.x509.GeneralName; - import com.netscape.certsrv.base.EBaseException; +import netscape.security.x509.GeneralName; + /** * Class that can be used to form general names from configuration file. * Used by policies and extension commands. @@ -33,7 +33,6 @@ import com.netscape.certsrv.base.EBaseException; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IGeneralNameConfig { diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java index 125a88511..725c3e942 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNameUtil.java @@ -27,7 +27,6 @@ package com.netscape.certsrv.policy; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IGeneralNameUtil { diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java index c3a35f913..698800645 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesAsConstraintsConfig.java @@ -31,7 +31,6 @@ import netscape.security.x509.GeneralNames; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IGeneralNamesAsConstraintsConfig { diff --git a/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java index e799195db..77ea0350e 100644 --- a/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/IGeneralNamesConfig.java @@ -31,7 +31,6 @@ import netscape.security.x509.GeneralNames; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IGeneralNamesConfig { diff --git a/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java b/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java index bdf8e12e5..bdd6efdc0 100644 --- a/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IKeyArchivalPolicy.java @@ -26,7 +26,6 @@ package com.netscape.certsrv.policy; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IKeyArchivalPolicy extends IPolicyRule { diff --git a/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java b/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java index 42d3e38e1..62989472c 100644 --- a/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IKeyRecoveryPolicy.java @@ -26,7 +26,6 @@ package com.netscape.certsrv.policy; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IKeyRecoveryPolicy extends IPolicyRule { diff --git a/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java b/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java index f56de9811..f262be0cd 100644 --- a/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java +++ b/base/common/src/com/netscape/certsrv/policy/IPolicyPredicateParser.java @@ -26,7 +26,6 @@ package com.netscape.certsrv.policy; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IPolicyPredicateParser { diff --git a/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java b/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java index 5ee591e86..d2e70e902 100644 --- a/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java +++ b/base/common/src/com/netscape/certsrv/policy/IPolicyProcessor.java @@ -40,7 +40,6 @@ import com.netscape.certsrv.base.ISubsystem; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IPolicyProcessor extends ISubsystem, diff --git a/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java b/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java index 601369813..8deb10e25 100644 --- a/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java +++ b/base/common/src/com/netscape/certsrv/policy/IPolicyRule.java @@ -34,7 +34,6 @@ import com.netscape.certsrv.request.PolicyResult; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IPolicyRule diff --git a/base/common/src/com/netscape/certsrv/policy/IPolicySet.java b/base/common/src/com/netscape/certsrv/policy/IPolicySet.java index 5170153ff..cc1da3fdc 100644 --- a/base/common/src/com/netscape/certsrv/policy/IPolicySet.java +++ b/base/common/src/com/netscape/certsrv/policy/IPolicySet.java @@ -38,7 +38,6 @@ import com.netscape.certsrv.request.PolicyResult; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IPolicySet { diff --git a/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java b/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java index 6f47ff6d9..bfd44c446 100644 --- a/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IRenewalPolicy.java @@ -26,7 +26,6 @@ package com.netscape.certsrv.policy; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IRenewalPolicy extends IPolicyRule { diff --git a/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java b/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java index d573c4bd2..940d240cf 100644 --- a/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java +++ b/base/common/src/com/netscape/certsrv/policy/IRevocationPolicy.java @@ -26,7 +26,6 @@ package com.netscape.certsrv.policy; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface IRevocationPolicy extends IPolicyRule { diff --git a/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java b/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java index be6e5f214..57d523cf9 100644 --- a/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java +++ b/base/common/src/com/netscape/certsrv/policy/ISubjAltNameConfig.java @@ -27,7 +27,6 @@ package com.netscape.certsrv.policy; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public interface ISubjAltNameConfig extends IGeneralNameConfig { diff --git a/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java b/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java index 4f121378b..0be193d87 100644 --- a/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java +++ b/base/common/src/com/netscape/certsrv/ra/IRegistrationAuthority.java @@ -19,8 +19,6 @@ package com.netscape.certsrv.ra; 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; @@ -28,6 +26,8 @@ import com.netscape.certsrv.publish.IPublisherProcessor; import com.netscape.certsrv.request.IRequestListener; import com.netscape.certsrv.request.IRequestQueue; +import netscape.security.x509.X500Name; + /** * An interface represents a Registration Authority that is * responsible for certificate enrollment operations. @@ -69,7 +69,6 @@ public interface IRegistrationAuthority extends ISubsystem { /** * Retrieves the policy processor of this registration authority. - * @deprecated * @return RA's policy processor */ public IPolicyProcessor getPolicyProcessor(); diff --git a/base/kra/src/com/netscape/kra/KRAPolicy.java b/base/kra/src/com/netscape/kra/KRAPolicy.java index eac3adb8c..a2392d77c 100644 --- a/base/kra/src/com/netscape/kra/KRAPolicy.java +++ b/base/kra/src/com/netscape/kra/KRAPolicy.java @@ -32,7 +32,6 @@ import com.netscape.cmscore.util.Debug; /** * KRA Policy. * - * @deprecated * @version $Revision$, $Date$ */ public class KRAPolicy implements IPolicy { diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java index 53139339b..7aff3e1d1 100644 --- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java +++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java @@ -177,9 +177,6 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove mId = id; } - /** - * @deprecated - */ public IPolicyProcessor getPolicyProcessor() { return mPolicy.getPolicyProcessor(); } diff --git a/base/server/cms/src/com/netscape/cms/policy/APolicyRule.java b/base/server/cms/src/com/netscape/cms/policy/APolicyRule.java index 8ed943503..0551927db 100644 --- a/base/server/cms/src/com/netscape/cms/policy/APolicyRule.java +++ b/base/server/cms/src/com/netscape/cms/policy/APolicyRule.java @@ -24,11 +24,6 @@ import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; import java.util.Vector; -import netscape.security.x509.CertificateX509Key; -import netscape.security.x509.KeyIdentifier; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X509Key; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -41,6 +36,11 @@ import com.netscape.certsrv.request.AgentApprovals; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + /** * The abstract policy rule that concrete implementations will * extend. @@ -51,7 +51,6 @@ import com.netscape.certsrv.request.PolicyResult; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public abstract class APolicyRule implements IPolicyRule { diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/server/cms/src/com/netscape/cms/policy/constraints/AgentPolicy.java index 2129f0f00..c935bf663 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/AgentPolicy.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/AgentPolicy.java @@ -42,7 +42,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class AgentPolicy extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java index fb56c67c4..0755a3a01 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java @@ -22,13 +22,6 @@ import java.util.Hashtable; import java.util.Locale; import java.util.Vector; -import netscape.ldap.LDAPAttribute; -import netscape.ldap.LDAPConnection; -import netscape.ldap.LDAPEntry; -import netscape.ldap.LDAPException; -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; @@ -41,6 +34,13 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.ldap.LDAPAttribute; +import netscape.ldap.LDAPConnection; +import netscape.ldap.LDAPEntry; +import netscape.ldap.LDAPException; +import netscape.ldap.LDAPSearchResults; +import netscape.ldap.LDAPv2; + /** * This checks if attribute present. * <P> @@ -50,7 +50,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class AttributePresentConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java index 9b5fbd152..0b8c82fbe 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java @@ -22,11 +22,6 @@ import java.security.interfaces.DSAParams; import java.util.Locale; import java.util.Vector; -import netscape.security.provider.DSAPublicKey; -import netscape.security.x509.CertificateX509Key; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X509Key; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -39,6 +34,11 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.provider.DSAPublicKey; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + /** * DSAKeyConstraints policy enforces min and max size of the key. * <P> @@ -48,7 +48,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class DSAKeyConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/base/server/cms/src/com/netscape/cms/policy/constraints/DefaultRevocation.java index fecb59049..19c4ae193 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/DefaultRevocation.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/DefaultRevocation.java @@ -40,7 +40,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class DefaultRevocation extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/IssuerConstraints.java index efd306bf3..645a63cb5 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/IssuerConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/IssuerConstraints.java @@ -20,9 +20,6 @@ package com.netscape.cms.policy.constraints; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.X500Name; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; @@ -34,6 +31,9 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.X500Name; +import netscape.security.x509.X509CertInfo; + /** * IssuerConstraints is a rule for restricting the issuers of the * certificates used for certificate-based enrollments. @@ -44,7 +44,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$ $Date$ */ public class IssuerConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java index d656ed463..c8f8d8469 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java @@ -22,10 +22,6 @@ import java.util.Locale; import java.util.StringTokenizer; import java.util.Vector; -import netscape.security.x509.CertificateX509Key; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X509Key; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; @@ -36,6 +32,10 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + /** * KeyAlgorithmConstraints enforces a constraint that the RA or a CA * honor only the keys generated using one of the permitted algorithms @@ -47,7 +47,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class KeyAlgorithmConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/base/server/cms/src/com/netscape/cms/policy/constraints/ManualAuthentication.java index 56b96f95f..80396497c 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/ManualAuthentication.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/ManualAuthentication.java @@ -40,7 +40,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class ManualAuthentication extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java index 363856197..9e6df7c70 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java @@ -22,13 +22,6 @@ import java.util.Locale; import java.util.StringTokenizer; import java.util.Vector; -import netscape.security.provider.RSAPublicKey; -import netscape.security.util.BigInt; -import netscape.security.x509.AlgorithmId; -import netscape.security.x509.CertificateX509Key; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X509Key; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -40,6 +33,13 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.provider.RSAPublicKey; +import netscape.security.util.BigInt; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + /** * RSAKeyConstraints policy enforces min and max size of the key. * Optionally checks the exponents. @@ -50,7 +50,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class RSAKeyConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalConstraints.java index 3ff977df5..b38563bfc 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalConstraints.java @@ -21,10 +21,6 @@ import java.util.Date; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateValidity; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -36,6 +32,10 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + /** * Whether to allow renewal of an expired cert. * @@ -47,7 +47,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class RenewalConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java index 2810fae10..df5774bd6 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java @@ -21,10 +21,6 @@ import java.util.Date; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateValidity; -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.base.IExtendedPluginInfo; @@ -36,6 +32,10 @@ import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; import com.netscape.cmsutil.util.Utils; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + /** * RenewalValidityConstraints is a default rule for Certificate * Renewal. This policy enforces the no of days before which a @@ -55,7 +55,6 @@ import com.netscape.cmsutil.util.Utils; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class RenewalValidityConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/RevocationConstraints.java index 88c59b2fd..bbdb9af67 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/RevocationConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/RevocationConstraints.java @@ -21,11 +21,6 @@ import java.util.Date; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateValidity; -import netscape.security.x509.RevocationReason; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -37,6 +32,11 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + /** * Whether to allow revocation of an expired cert. * <P> @@ -46,7 +46,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class RevocationConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java index 15b12af40..59fde827d 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java @@ -21,10 +21,6 @@ import java.util.Locale; import java.util.StringTokenizer; import java.util.Vector; -import netscape.security.x509.AlgorithmId; -import netscape.security.x509.CertificateAlgorithmId; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.authority.ICertAuthority; @@ -40,6 +36,10 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.AlgorithmId; +import netscape.security.x509.CertificateAlgorithmId; +import netscape.security.x509.X509CertInfo; + /** * SigningAlgorithmConstraints enforces that only a supported * signing algorithm be requested. @@ -50,7 +50,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class SigningAlgorithmConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java index bc41d1bcb..8cf6b0f37 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java @@ -50,7 +50,6 @@ import netscape.security.x509.X509CertInfo; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPolicy, IExtendedPluginInfo { diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java index 27b5d1a92..bacace981 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java @@ -26,7 +26,6 @@ package com.netscape.cms.policy.constraints; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class UniqueSubjectName extends UniqueSubjectNameConstraints { diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java index fb52b1302..3ebbcc7b0 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java @@ -22,12 +22,6 @@ import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateSubjectName; -import netscape.security.x509.KeyUsageExtension; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authority.ICertAuthority; import com.netscape.certsrv.base.EBaseException; @@ -43,6 +37,12 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateSubjectName; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.X509CertImpl; +import netscape.security.x509.X509CertInfo; + /** * Checks the uniqueness of the subject name. This policy * can only be used (installed) in Certificate Authority @@ -63,7 +63,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class UniqueSubjectNameConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/base/server/cms/src/com/netscape/cms/policy/constraints/ValidityConstraints.java index 72be9d75a..ff17c8308 100644 --- a/base/server/cms/src/com/netscape/cms/policy/constraints/ValidityConstraints.java +++ b/base/server/cms/src/com/netscape/cms/policy/constraints/ValidityConstraints.java @@ -21,9 +21,6 @@ import java.util.Date; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateValidity; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.IExtendedPluginInfo; @@ -34,6 +31,9 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateValidity; +import netscape.security.x509.X509CertInfo; + /** * ValidityConstraints is a default rule for Enrollment and * Renewal that enforces minimum and maximum validity periods @@ -49,7 +49,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class ValidityConstraints extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java index 21e4ad920..0699dcc7b 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java @@ -24,13 +24,6 @@ import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import netscape.security.extensions.AuthInfoAccessExtension; -import netscape.security.util.ObjectIdentifier; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.GeneralName; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -43,6 +36,13 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.extensions.AuthInfoAccessExtension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + /** * Authority Information Access extension policy. * If this policy is enabled, it adds an authority @@ -76,7 +76,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class AuthInfoAccessExt extends APolicyRule implements diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java index 1a2220239..5a72a6a05 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java @@ -54,7 +54,6 @@ import netscape.security.x509.X509CertInfo; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class AuthorityKeyIdentifierExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java index 5c05d86d9..55ee29036 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java @@ -56,7 +56,6 @@ import netscape.security.x509.X509CertInfo; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class BasicConstraintsExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java index 7cf50385e..123a6e38f 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java @@ -24,6 +24,17 @@ import java.util.Locale; import java.util.StringTokenizer; import java.util.Vector; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; +import com.netscape.cms.policy.APolicyRule; + import netscape.security.util.BitArray; import netscape.security.x509.CRLDistributionPoint; import netscape.security.x509.CRLDistributionPointsExtension; @@ -38,17 +49,6 @@ import netscape.security.x509.URIName; import netscape.security.x509.X500Name; import netscape.security.x509.X509CertInfo; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.policy.IEnrollmentPolicy; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.PolicyResult; -import com.netscape.cms.policy.APolicyRule; - /** * The type of the distribution point or issuer name. The name is expressed * as a simple string in the configuration file, so this attribute is needed @@ -61,7 +61,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ class NameType { diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java index 4124d430d..78c828435 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java @@ -23,6 +23,18 @@ import java.util.Locale; import java.util.StringTokenizer; import java.util.Vector; +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.IExtendedPluginInfo; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; +import com.netscape.cms.policy.APolicyRule; + import netscape.security.util.ObjectIdentifier; import netscape.security.x509.CPSuri; import netscape.security.x509.CertificateExtensions; @@ -37,18 +49,6 @@ import netscape.security.x509.PolicyQualifiers; import netscape.security.x509.UserNotice; import netscape.security.x509.X509CertInfo; -import com.netscape.certsrv.apps.CMS; -import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.certsrv.base.IExtendedPluginInfo; -import com.netscape.certsrv.base.ISubsystem; -import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.policy.IEnrollmentPolicy; -import com.netscape.certsrv.policy.IPolicyProcessor; -import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.PolicyResult; -import com.netscape.cms.policy.APolicyRule; - /** * Certificate Policies. * Adds certificate policies extension. @@ -59,7 +59,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class CertificatePoliciesExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java index 58ce112f3..cfc793c22 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java @@ -23,11 +23,6 @@ import java.util.Date; import java.util.Locale; import java.util.Vector; -import netscape.security.extensions.CertificateRenewalWindowExtension; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -39,6 +34,11 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.extensions.CertificateRenewalWindowExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.X509CertInfo; + /** * Certificate Renewal Window Extension Policy * <P> @@ -48,7 +48,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class CertificateRenewalWindowExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java index 779be165b..3a4c1eb19 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java @@ -22,14 +22,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.extensions.CertificateScopeEntry; -import netscape.security.extensions.CertificateScopeOfUseExtension; -import netscape.security.util.BigInt; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.GeneralName; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -42,6 +34,14 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.extensions.CertificateScopeEntry; +import netscape.security.extensions.CertificateScopeOfUseExtension; +import netscape.security.util.BigInt; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralName; +import netscape.security.x509.X509CertInfo; + /** * Certificate Scope Of Use extension policy. This extension * is defined in draft-thayes-cert-scope-00.txt @@ -52,7 +52,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class CertificateScopeOfUseExt extends APolicyRule implements diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java index 4ba834dbe..84e3a54a2 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java @@ -48,7 +48,6 @@ import netscape.security.x509.X509CertInfo; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class ExtendedKeyUsageExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/server/cms/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java index 35f5313c1..2f52f9752 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java @@ -27,13 +27,6 @@ import java.util.Hashtable; import java.util.Locale; import java.util.Vector; -import netscape.security.extensions.GenericASN1Extension; -import netscape.security.util.ObjectIdentifier; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.OIDMap; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -45,6 +38,13 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.extensions.GenericASN1Extension; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.OIDMap; +import netscape.security.x509.X509CertInfo; + /** * Private Integer extension policy. * If this policy is enabled, it adds an Private Integer @@ -82,7 +82,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class GenericASN1Ext extends APolicyRule implements diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java index 9ceaf99bd..71eefa041 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java @@ -22,11 +22,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.IssuerAlternativeNameExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -40,6 +35,11 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.IssuerAlternativeNameExtension; +import netscape.security.x509.X509CertInfo; + /** * Issuer Alt Name Extension policy. * @@ -52,7 +52,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class IssuerAltNameExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/KeyUsageExt.java index 24e5f45ed..f864ab93c 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/KeyUsageExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/KeyUsageExt.java @@ -23,12 +23,6 @@ import java.security.cert.X509Certificate; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateChain; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.KeyUsageExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authority.ICertAuthority; import com.netscape.certsrv.base.EBaseException; @@ -43,6 +37,12 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.X509CertInfo; + /** * Policy to add Key Usage Extension. * Adds the key usage extension based on what's requested. @@ -53,7 +53,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class KeyUsageExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCCommentExt.java index ca18b8023..c0b0656bf 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/NSCCommentExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCCommentExt.java @@ -26,11 +26,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.NSCCommentExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -43,6 +38,11 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.NSCCommentExtension; +import netscape.security.x509.X509CertInfo; + /** * Netscape comment * Adds Netscape comment policy @@ -53,7 +53,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class NSCCommentExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java index c5daabed9..ed38f6fc8 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java @@ -23,13 +23,6 @@ import java.security.cert.X509Certificate; import java.util.Locale; import java.util.Vector; -import netscape.security.extensions.NSCertTypeExtension; -import netscape.security.x509.CertificateChain; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.KeyUsageExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authority.ICertAuthority; @@ -45,6 +38,13 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.extensions.NSCertTypeExtension; +import netscape.security.x509.CertificateChain; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.KeyUsageExtension; +import netscape.security.x509.X509CertInfo; + /** * NS Cert Type policy. * Adds the ns cert type extension depending on cert type requested. @@ -55,7 +55,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class NSCertTypeExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java index 1b132e835..41a11c59b 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java @@ -22,13 +22,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.GeneralSubtree; -import netscape.security.x509.GeneralSubtrees; -import netscape.security.x509.NameConstraintsExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -42,6 +35,13 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralSubtree; +import netscape.security.x509.GeneralSubtrees; +import netscape.security.x509.NameConstraintsExtension; +import netscape.security.x509.X509CertInfo; + /** * Name Constraints Extension Policy * Adds the name constraints extension to a (CA) certificate. @@ -53,7 +53,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class NameConstraintsExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java index da0584cb0..1cb60a72b 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java @@ -48,7 +48,6 @@ import netscape.security.x509.X509CertInfo; * </PRE> * <P> * - * @deprecated * @version $Revision$ $Date$ */ public class OCSPNoCheckExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java index 0bb77e207..1d5b3cac3 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java @@ -22,11 +22,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.PolicyConstraintsExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -39,6 +34,11 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.PolicyConstraintsExtension; +import netscape.security.x509.X509CertInfo; + /** * Policy Constraints Extension Policy * Adds the policy constraints extension to (CA) certificates. @@ -50,7 +50,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class PolicyConstraintsExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java index 0af8b86ca..5e20a2d26 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java @@ -22,14 +22,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.util.ObjectIdentifier; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificatePolicyId; -import netscape.security.x509.CertificatePolicyMap; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.PolicyMappingsExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -42,6 +34,14 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificatePolicyId; +import netscape.security.x509.CertificatePolicyMap; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.PolicyMappingsExtension; +import netscape.security.x509.X509CertInfo; + /** * Policy Mappings Extension Policy * Adds the Policy Mappings extension to a (CA) certificate. @@ -53,7 +53,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class PolicyMappingsExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PresenceExt.java index 7f44c8eb0..3b2502f4f 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/PresenceExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/PresenceExt.java @@ -37,7 +37,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class PresenceExt extends APolicyRule { diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java index fd52e9bb1..17a772e2c 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java @@ -24,11 +24,6 @@ import java.util.Date; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.PrivateKeyUsageExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -41,6 +36,11 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.PrivateKeyUsageExtension; +import netscape.security.x509.X509CertInfo; + /** * PrivateKeyUsagePeriod Identifier Extension policy. * <P> @@ -50,7 +50,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class PrivateKeyUsagePeriodExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java index b5d6d8eec..f9aca133d 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java @@ -22,10 +22,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.BasicConstraintsExtension; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -36,6 +32,10 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.BasicConstraintsExtension; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.X509CertInfo; + /** * Remove Basic Constraints policy. * Adds the Basic constraints extension. @@ -46,7 +46,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class RemoveBasicConstraintsExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java index d6e626aa9..1e06b5dd4 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java @@ -22,13 +22,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.GeneralNames; -import netscape.security.x509.RFC822Name; -import netscape.security.x509.SubjectAlternativeNameExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.base.EBaseException; @@ -41,6 +34,13 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.RFC822Name; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X509CertInfo; + /** * * THIS POLICY HAS BEEN DEPRECATED SINCE CMS 4.2. @@ -63,7 +63,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class SubjAltNameExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java index 0d89d8876..3634cc629 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java @@ -23,13 +23,6 @@ import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.GeneralName; -import netscape.security.x509.GeneralNames; -import netscape.security.x509.SubjectAlternativeNameExtension; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -44,6 +37,13 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.SubjectAlternativeNameExtension; +import netscape.security.x509.X509CertInfo; + /** * Subject Alternative Name extension policy. * @@ -65,7 +65,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class SubjectAltNameExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java index bcd9c9885..f939c3675 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java @@ -23,16 +23,6 @@ import java.util.Enumeration; import java.util.Locale; import java.util.Vector; -import netscape.security.util.DerValue; -import netscape.security.util.ObjectIdentifier; -import netscape.security.x509.AVAValueConverter; -import netscape.security.x509.Attribute; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.SubjectDirAttributesExtension; -import netscape.security.x509.X500NameAttrMap; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -44,6 +34,16 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.AVAValueConverter; +import netscape.security.x509.Attribute; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.SubjectDirAttributesExtension; +import netscape.security.x509.X500NameAttrMap; +import netscape.security.x509.X509CertInfo; + /** * Policy to add the subject directory attributes extension. * <P> @@ -53,7 +53,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class SubjectDirectoryAttributesExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java index 16fc73347..1144f8bad 100644 --- a/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java +++ b/base/server/cms/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java @@ -24,14 +24,6 @@ import java.security.cert.CertificateException; import java.util.Locale; import java.util.Vector; -import netscape.security.x509.CertificateExtensions; -import netscape.security.x509.CertificateVersion; -import netscape.security.x509.CertificateX509Key; -import netscape.security.x509.KeyIdentifier; -import netscape.security.x509.SubjectKeyIdentifierExtension; -import netscape.security.x509.X509CertInfo; -import netscape.security.x509.X509Key; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; @@ -45,6 +37,14 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import netscape.security.x509.CertificateExtensions; +import netscape.security.x509.CertificateVersion; +import netscape.security.x509.CertificateX509Key; +import netscape.security.x509.KeyIdentifier; +import netscape.security.x509.SubjectKeyIdentifierExtension; +import netscape.security.x509.X509CertInfo; +import netscape.security.x509.X509Key; + /** * Subject Public Key Extension Policy * Adds the subject public key id extension to certificates. @@ -55,7 +55,6 @@ import com.netscape.cms.policy.APolicyRule; * </PRE> * <P> * - * @deprecated * @version $Revision$, $Date$ */ public class SubjectKeyIdentifierExt extends APolicyRule diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index bfc1e6f4a..776c9d290 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -50,7 +50,6 @@ import com.netscape.certsrv.ra.IRegistrationAuthority; * for registering an instance of this with the remote * administration subsystem. * - * @deprecated * @version $Revision$, $Date$ */ public class PolicyAdminServlet extends AdminServlet { diff --git a/base/server/cmscore/src/com/netscape/cmscore/policy/AndExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/AndExpression.java index 9a2274b11..e6e5b496c 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/policy/AndExpression.java +++ b/base/server/cmscore/src/com/netscape/cmscore/policy/AndExpression.java @@ -27,7 +27,6 @@ import com.netscape.certsrv.request.IRequest; * * Expressions are used as predicates for policy selection. * - * @deprecated * @author kanda * @version $Revision$, $Date$ */ diff --git a/base/server/cmscore/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/base/server/cmscore/src/com/netscape/cmscore/policy/GeneralNameUtil.java index 8d8c05bc6..6bd60e009 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/policy/GeneralNameUtil.java +++ b/base/server/cmscore/src/com/netscape/cmscore/policy/GeneralNameUtil.java @@ -23,6 +23,19 @@ import java.util.Enumeration; import java.util.StringTokenizer; import java.util.Vector; +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.policy.IGeneralNameAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNameConfig; +import com.netscape.certsrv.policy.IGeneralNameUtil; +import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; +import com.netscape.certsrv.policy.IGeneralNamesConfig; +import com.netscape.certsrv.policy.ISubjAltNameConfig; +import com.netscape.cmscore.util.Debug; +import com.netscape.cmsutil.util.Utils; + import netscape.security.util.DerValue; import netscape.security.util.ObjectIdentifier; import netscape.security.x509.DNSName; @@ -37,23 +50,9 @@ 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.policy.IGeneralNameAsConstraintsConfig; -import com.netscape.certsrv.policy.IGeneralNameConfig; -import com.netscape.certsrv.policy.IGeneralNameUtil; -import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig; -import com.netscape.certsrv.policy.IGeneralNamesConfig; -import com.netscape.certsrv.policy.ISubjAltNameConfig; -import com.netscape.cmscore.util.Debug; -import com.netscape.cmsutil.util.Utils; - /** * Class that can be used to form general names from configuration file. * Used by policies and extension commands. - * @deprecated */ public class GeneralNameUtil implements IGeneralNameUtil { diff --git a/base/server/cmscore/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/base/server/cmscore/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java index 7b3eac274..2a37e71f4 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java +++ b/base/server/cmscore/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java @@ -60,7 +60,6 @@ import com.netscape.cmscore.util.Debug; * the processor itself presents itself as one big policy to the * request processor. * - * @deprecated * @author kanda * @version $Revision$, $Date$ */ @@ -1479,9 +1478,6 @@ class RegisteredPolicy { } } -/** - * @deprecated - */ class PolicyInstance { String mInstanceId; String mImplId; diff --git a/base/server/cmscore/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/base/server/cmscore/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java index 1fbcf2738..e9a7371d9 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java +++ b/base/server/cmscore/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java @@ -21,11 +21,6 @@ import com.netscape.certsrv.policy.IPolicyRule; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; -/** - * - * @deprecated - * - */ public class JavaScriptRequestProxy { IRequest req; diff --git a/base/server/cmscore/src/com/netscape/cmscore/policy/OrExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/OrExpression.java index 512bba256..7da07a8bc 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/policy/OrExpression.java +++ b/base/server/cmscore/src/com/netscape/cmscore/policy/OrExpression.java @@ -27,7 +27,6 @@ import com.netscape.certsrv.request.IRequest; * * Expressions are used as predicates for policy selection. * - * @deprecated * @author kanda * @version $Revision$, $Date$ */ diff --git a/base/server/cmscore/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index c55b84ece..08f74e2f5 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -36,7 +36,6 @@ import com.netscape.cmscore.util.Debug; * is treated as (a AND b) OR e OR (c AND d) * 4. If this is n't adequate, roll your own. * - * @deprecated * @author kanda * @version $Revision$, $Date$ */ diff --git a/base/server/cmscore/src/com/netscape/cmscore/policy/PolicySet.java b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicySet.java index b5e3459d1..4c1696130 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/policy/PolicySet.java +++ b/base/server/cmscore/src/com/netscape/cmscore/policy/PolicySet.java @@ -33,7 +33,6 @@ import com.netscape.cmscore.util.Debug; * Implements a policy set per IPolicySet interface. This class * uses a vector of ordered policies to enforce priority. * - * @deprecated * @author kanda * @version $Revision$, $Date$ */ diff --git a/base/server/cmscore/src/com/netscape/cmscore/policy/SimpleExpression.java b/base/server/cmscore/src/com/netscape/cmscore/policy/SimpleExpression.java index 4f8f0eb9a..fa8b7df08 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/policy/SimpleExpression.java +++ b/base/server/cmscore/src/com/netscape/cmscore/policy/SimpleExpression.java @@ -33,7 +33,6 @@ import com.netscape.cmscore.util.Debug; * * Expressions are used as predicates for policy selection. * - * @deprecated * @author kanda * @version $Revision$, $Date$ */ |