summaryrefslogtreecommitdiffstats
path: root/pki/base/common/src/com/netscape/cms/publish
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-02-20 11:42:23 -0600
committerEndi Sukma Dewata <edewata@redhat.com>2012-02-23 21:14:19 -0600
commit34496a33fbbee462f67410e2ee54a7986b3aedae (patch)
tree3ca32c9e7bbbbb0b876dd1dddc947417363f6592 /pki/base/common/src/com/netscape/cms/publish
parent84ba9e3cb3bbdc89852aaf70185980ce2d9e325a (diff)
downloadpki-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/base/common/src/com/netscape/cms/publish')
-rw-r--r--pki/base/common/src/com/netscape/cms/publish/publishers/LdapCertSubjPublisher.java2
-rw-r--r--pki/base/common/src/com/netscape/cms/publish/publishers/LdapEncryptCertPublisher.java2
-rw-r--r--pki/base/common/src/com/netscape/cms/publish/publishers/LdapUserCertPublisher.java2
-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
4 files changed, 4 insertions, 4 deletions
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);
}