diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-20 11:42:23 -0600 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-23 21:14:19 -0600 |
commit | 34496a33fbbee462f67410e2ee54a7986b3aedae (patch) | |
tree | 3ca32c9e7bbbbb0b876dd1dddc947417363f6592 /pki | |
parent | 84ba9e3cb3bbdc89852aaf70185980ce2d9e325a (diff) | |
download | pki-34496a33fbbee462f67410e2ee54a7986b3aedae.tar.gz pki-34496a33fbbee462f67410e2ee54a7986b3aedae.tar.xz pki-34496a33fbbee462f67410e2ee54a7986b3aedae.zip |
Renamed Utils to avoid conflicts.
The Utils classes in com.netscape.cms.publish.publishers
and com.netscape.cms.servlet.common packages have been renamed
to PublisherUtils and ServletUtils to avoid conflicts with
com.netscape.cmsutil.util.Utils.
Ticket #90
Diffstat (limited to 'pki')
-rw-r--r-- | pki/base/common/src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java | 2 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java | 2 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java | 2 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java (renamed from pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java) | 2 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java | 4 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java (renamed from pki/base/common/src/com/netscape/cms/servlet/common/Utils.java) | 2 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java | 4 |
8 files changed, 11 insertions, 11 deletions
diff --git a/pki/base/common/src/CMakeLists.txt b/pki/base/common/src/CMakeLists.txt index 0ea1d61e4..6d78f2fdd 100644 --- a/pki/base/common/src/CMakeLists.txt +++ b/pki/base/common/src/CMakeLists.txt @@ -420,7 +420,7 @@ set(pki-cms_java_SRCS com/netscape/cms/publish/publishers/FileBasedPublisher.java com/netscape/cms/publish/publishers/LdapCrlPublisher.java com/netscape/cms/publish/publishers/LdapCertificatePairPublisher.java - com/netscape/cms/publish/publishers/Utils.java + com/netscape/cms/publish/publishers/PublisherUtils.java com/netscape/cms/publish/publishers/OCSPPublisher.java com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java @@ -487,7 +487,7 @@ set(pki-cms_java_SRCS com/netscape/cms/servlet/common/CMSRequest.java com/netscape/cms/servlet/common/CMSFile.java com/netscape/cms/servlet/common/IRawJS.java - com/netscape/cms/servlet/common/Utils.java + com/netscape/cms/servlet/common/ServletUtils.java com/netscape/cms/servlet/common/GenPendingTemplateFiller.java com/netscape/cms/servlet/common/CMSGWResources.java com/netscape/cms/servlet/common/GenUnexpectedErrorTemplateFiller.java diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java index fed865122..5975872ff 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java @@ -260,7 +260,7 @@ public class LdapCertSubjPublisher implements ILdapPublisher { while (vals.hasMoreElements()) { val = vals.nextElement(); - if (Utils.byteArraysAreEqual(certEnc, val)) { + if (PublisherUtils.byteArraysAreEqual(certEnc, val)) { hasCert = true; continue; } diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java index d5cbfb323..d2c488620 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java @@ -329,7 +329,7 @@ public class LdapEncryptCertPublisher implements ILdapPublisher, IExtendedPlugin while (vals.hasMoreElements()) { val = (byte[]) vals.nextElement(); - if (Utils.byteArraysAreEqual(val, bval)) { + if (PublisherUtils.byteArraysAreEqual(val, bval)) { return true; } } diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java index afa0601dc..0eba679ad 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java @@ -303,7 +303,7 @@ public class LdapUserCertPublisher implements ILdapPublisher, IExtendedPluginInf val = vals.nextElement(); if (val.length == 0) continue; - if (Utils.byteArraysAreEqual(val, bval)) { + if (PublisherUtils.byteArraysAreEqual(val, bval)) { return true; } } diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java b/pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java index 03561ee78..314e87e63 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/Utils.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/PublisherUtils.java @@ -33,7 +33,7 @@ import java.util.Vector; * * @version $Revision$, $Date$ */ -public class Utils { +public class PublisherUtils { public static void checkHost(String hostname) throws UnknownHostException { InetAddress.getByName(hostname); } diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java index 041818d0a..a32116b43 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -95,7 +95,7 @@ import com.netscape.cms.servlet.common.GenSuccessTemplateFiller; import com.netscape.cms.servlet.common.GenSvcPendingTemplateFiller; import com.netscape.cms.servlet.common.GenUnexpectedErrorTemplateFiller; import com.netscape.cms.servlet.common.ICMSTemplateFiller; -import com.netscape.cms.servlet.common.Utils; +import com.netscape.cms.servlet.common.ServletUtils; import com.netscape.cmsutil.xml.XMLObject; /** @@ -274,7 +274,7 @@ public abstract class CMSServlet extends HttpServlet { mId = sc.getInitParameter(PROP_ID); try { - mAclMethod = Utils.initializeAuthz(sc, mAuthz, mId); + mAclMethod = ServletUtils.initializeAuthz(sc, mAuthz, mId); } catch (ServletException e) { log(ILogger.LL_FAILURE, e.toString()); throw e; diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/Utils.java b/pki/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java index 9c728c03e..5c16b8195 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/common/Utils.java +++ b/pki/base/common/src/com/netscape/cms/servlet/common/ServletUtils.java @@ -32,7 +32,7 @@ import com.netscape.certsrv.base.IConfigStore; * * @version $Revision$, $Date$ */ -public class Utils { +public class ServletUtils { public final static String AUTHZ_SRC_LDAP = "ldap"; public final static String AUTHZ_SRC_TYPE = "sourceType"; diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java index 7bc6304be..457b8422b 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileServlet.java @@ -43,7 +43,7 @@ import com.netscape.certsrv.util.IStatsSubsystem; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.base.UserInfo; import com.netscape.cms.servlet.common.CMSRequest; -import com.netscape.cms.servlet.common.Utils; +import com.netscape.cms.servlet.common.ServletUtils; /** * This servlet is the base class of all profile servlets. @@ -184,7 +184,7 @@ public class ProfileServlet extends CMSServlet { mId = sc.getInitParameter(PROP_ID); try { - mAclMethod = Utils.initializeAuthz(sc, mAuthz, mId); + mAclMethod = ServletUtils.initializeAuthz(sc, mAuthz, mId); } catch (ServletException e) { log(ILogger.LL_FAILURE, e.toString()); throw e; |