diff options
| author | Ade Lee <alee@redhat.com> | 2014-02-10 15:35:21 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-02-19 10:47:48 -0500 |
| commit | 03f688d8becf32748711a5832af1a736e838905d (patch) | |
| tree | 91212b31e507a1a282428157b057d772661b5091 /base/server/cms/src/com | |
| parent | f7b4c70c23774a734b23929d64f5b879910ead25 (diff) | |
Fix eclipse warnings.
Diffstat (limited to 'base/server/cms/src/com')
4 files changed, 19 insertions, 26 deletions
diff --git a/base/server/cms/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java b/base/server/cms/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java index b3b16448d..6308715b0 100644 --- a/base/server/cms/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java +++ b/base/server/cms/src/com/netscape/cms/profile/def/RandomizedValidityDefault.java @@ -122,13 +122,13 @@ public class RandomizedValidityDefault extends EnrollDefault { "CMS_PROFILE_VALIDITY_START_TIME")); } else if (name.equals(CONFIG_NOT_BEFORE_RANDOM_BITS)) { return new Descriptor(IDescriptor.STRING, - null, + null, "10", /* 10 bits */ CMS.getUserMessage(locale, "CMS_PROFILE_NOT_BEFORE_RANDOM_BITS")); } else if (name.equals(CONFIG_NOT_AFTER_RANDOM_BITS)) { return new Descriptor(IDescriptor.STRING, - null, + null, "10", /* 10 bits */ CMS.getUserMessage(locale, "CMS_PROFILE_NOT_AFTER_RANDOM_BITS")); @@ -261,12 +261,11 @@ public class RandomizedValidityDefault extends EnrollDefault { if (numBits > 0) { maxSecs = (1 << numBits) - 1; int numBytes = (numBits+7)/8; - int byteSecs = (1 << (numBytes * 8)) - 1; byte[] randomBits = new byte[numBytes]; mRandom.nextBytes(randomBits); for (int i = 0; i < numBytes; i++) { secs <<= 8; - secs |= (int)(randomBits[i]) & 0xFF; + secs |= (randomBits[i]) & 0xFF; } secs &= maxSecs; } @@ -339,7 +338,7 @@ public class RandomizedValidityDefault extends EnrollDefault { CMS.debug("RandomizedValidityDefault populate notAfterRandomized = "+notAfterRandomized); Date notAfterMax = new Date(notAfterValueMax); CMS.debug("RandomizedValidityDefault populate notAfterMax = "+notAfterMax); - CertificateValidity validity = + CertificateValidity validity = new CertificateValidity(notBeforeRandomized, notAfterRandomized); try { diff --git a/base/server/cms/src/com/netscape/cms/profile/input/SubjectAltNameExtInput.java b/base/server/cms/src/com/netscape/cms/profile/input/SubjectAltNameExtInput.java index 72dc55b6c..d03ad0690 100644 --- a/base/server/cms/src/com/netscape/cms/profile/input/SubjectAltNameExtInput.java +++ b/base/server/cms/src/com/netscape/cms/profile/input/SubjectAltNameExtInput.java @@ -17,14 +17,20 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.profile.input; -import java.util.*; -import com.netscape.certsrv.base.*; -import com.netscape.certsrv.profile.*; -import com.netscape.certsrv.request.*; -import com.netscape.certsrv.property.*; -import com.netscape.certsrv.apps.*; - -import com.netscape.cms.profile.common.*; +import java.util.Enumeration; +import java.util.Locale; +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.profile.EProfileException; +import com.netscape.certsrv.profile.IProfile; +import com.netscape.certsrv.profile.IProfileContext; +import com.netscape.certsrv.profile.IProfileInput; +import com.netscape.certsrv.property.Descriptor; +import com.netscape.certsrv.property.IDescriptor; +import com.netscape.certsrv.request.IRequest; /** @@ -37,7 +43,7 @@ import com.netscape.cms.profile.common.*; * <p> * */ -public class SubjectAltNameExtInput extends EnrollInput implements IProfileInput { +public class SubjectAltNameExtInput extends EnrollInput implements IProfileInput { public static final int DEF_REQ_ENTRIES = 4; diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java index 64a9856fc..8a7bc556e 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevoke.java @@ -65,8 +65,6 @@ import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; -import com.netscape.certsrv.usrgrp.ICertUserLocator; -import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.CMSTemplate; @@ -90,8 +88,6 @@ public class DoRevoke extends CMSServlet { private String mFormPath = null; private IPublisherProcessor mPublisherProcessor = null; private int mTimeLimits = 30; /* in seconds */ - private IUGSubsystem mUG = null; - private ICertUserLocator mUL = null; public DoRevoke() { super(); @@ -107,9 +103,6 @@ public class DoRevoke extends CMSServlet { super.init(sc); mFormPath = "/" + mAuthority.getId() + "/" + TPL_FILE; - mUG = (IUGSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_UG); - mUL = mUG.getCertUserLocator(); - if (mAuthority instanceof ICertificateAuthority) { mCertDB = ((ICertificateAuthority) mAuthority).getCertificateRepository(); } diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCookie.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCookie.java index 1e8c65182..b8030f01a 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCookie.java +++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/GetCookie.java @@ -52,11 +52,6 @@ public class GetCookie extends CMSServlet { private String mErrorFormPath = null; private String mFormPath = null; - private final static String LOGGING_SIGNED_AUDIT_SECURITY_DOMAIN_UPDATE = - "LOGGING_SIGNED_AUDIT_SECURITY_DOMAIN_UPDATE_1"; - private final static String LOGGING_SIGNED_AUDIT_ROLE_ASSUME = - "LOGGING_SIGNED_AUDIT_ROLE_ASSUME_3"; - public GetCookie() { super(); } |
