diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/policy')
8 files changed, 78 insertions, 41 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java index fb3134ffa..d58cfe132 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/AndExpression.java @@ -18,8 +18,8 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java index 7a8ab4342..8f16548db 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java @@ -18,16 +18,36 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.io.*; -import java.util.Vector; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.util.Enumeration; +import java.util.StringTokenizer; +import java.util.Vector; -import netscape.security.x509.*; -import netscape.security.util.*; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import netscape.security.util.DerValue; +import netscape.security.util.ObjectIdentifier; +import netscape.security.x509.DNSName; +import netscape.security.x509.EDIPartyName; +import netscape.security.x509.GeneralName; +import netscape.security.x509.GeneralNameInterface; +import netscape.security.x509.GeneralNames; +import netscape.security.x509.IPAddressName; +import netscape.security.x509.InvalidIPAddressException; +import netscape.security.x509.OIDName; +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; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java index 63b28d995..95d668283 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java @@ -18,21 +18,35 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.text.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.StringTokenizer; +import java.util.Vector; + +import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.authority.IAuthority; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.base.ISubsystem; +import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IEnrollmentPolicy; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.certsrv.policy.IKeyArchivalPolicy; +import com.netscape.certsrv.policy.IKeyRecoveryPolicy; +import com.netscape.certsrv.policy.IPolicyProcessor; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.policy.IPolicySet; +import com.netscape.certsrv.policy.IRenewalPolicy; +import com.netscape.certsrv.policy.IRevocationPolicy; import com.netscape.certsrv.request.IRequest; -import com.netscape.certsrv.request.IPolicy; import com.netscape.certsrv.request.PolicyResult; -import com.netscape.certsrv.apps.*; -import com.netscape.certsrv.policy.*; -import com.netscape.certsrv.authority.*; -import com.netscape.certsrv.common.*; -import com.netscape.certsrv.logging.*; -import com.netscape.certsrv.base.*; -import com.netscape.cmscore.base.*; -import com.netscape.certsrv.base.IConfigStore; -import com.netscape.cmscore.util.*; +import com.netscape.cmscore.base.PropConfigStore; +import com.netscape.cmscore.base.SubsystemRegistry; import com.netscape.cmscore.request.ARequestQueue; +import com.netscape.cmscore.util.AssertionException; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java index 3f421fca4..fde12d04f 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/JavaScriptRequestProxy.java @@ -18,10 +18,9 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.policy.*; - -import com.netscape.cmscore.util.Debug; +import com.netscape.certsrv.policy.IPolicyRule; +import com.netscape.certsrv.request.IRequest; +import com.netscape.certsrv.request.PolicyResult; public class JavaScriptRequestProxy { diff --git a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java index dfbcb0ef6..f1bb6457a 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/OrExpression.java @@ -18,8 +18,8 @@ package com.netscape.cmscore.policy; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; import com.netscape.certsrv.request.IRequest; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index 46a874291..a7f6f2218 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -18,12 +18,16 @@ package com.netscape.cmscore.policy; -import java.util.*; -import java.io.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmscore.util.*; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.base.EBaseException; +import com.netscape.certsrv.base.IAttrSet; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.cmscore.util.Debug; /** diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java index 6ec1fa5c2..17a19e9d4 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java @@ -21,9 +21,6 @@ package com.netscape.cmscore.policy; import java.util.Enumeration; import java.util.Vector; -import netscape.security.x509.X509CertImpl; -import netscape.security.x509.X509CertInfo; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.policy.IExpression; diff --git a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java index 7b771442c..5e6458be2 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/SimpleExpression.java @@ -18,12 +18,15 @@ package com.netscape.cmscore.policy; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.policy.*; -import com.netscape.cmscore.util.*; -import com.netscape.certsrv.request.IRequest; +import java.util.Enumeration; +import java.util.Vector; + import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.policy.EPolicyException; +import com.netscape.certsrv.policy.IExpression; +import com.netscape.certsrv.request.IRequest; +import com.netscape.cmscore.util.AssertionException; +import com.netscape.cmscore.util.Debug; /** |