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
dogtagpki · Feb 24, 2012 · 34496a3 · 34496a3
1 parent 84ba9e3
commit 34496a3
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -260,7 +260,7 @@ public void unpublish(LDAPConnection conn, String dn, Object certObj)
 
                 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
@@ -329,7 +329,7 @@ public static boolean ByteValueExists(LDAPAttribute attr, byte[] bval) {
 
         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
@@ -303,7 +303,7 @@ public static boolean ByteValueExists(LDAPAttribute attr, byte[] bval) {
             val = vals.nextElement();
             if (val.length == 0)
                 continue;
-            if (Utils.byteArraysAreEqual(val, bval)) {
+            if (PublisherUtils.byteArraysAreEqual(val, bval)) {
                 return true;
             }
         }

diff --git a/...etscape/cms/publish/publishers/Utils.java → ...ms/publish/publishers/PublisherUtils.java b/...etscape/cms/publish/publishers/Utils.java → ...ms/publish/publishers/PublisherUtils.java
@@ -33,7 +33,7 @@
  * 
  * @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
@@ -95,7 +95,7 @@
 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 void init(ServletConfig sc) throws ServletException {
         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/...om/netscape/cms/servlet/common/Utils.java → ...cape/cms/servlet/common/ServletUtils.java b/...om/netscape/cms/servlet/common/Utils.java → ...cape/cms/servlet/common/ServletUtils.java
@@ -32,7 +32,7 @@
  * 
  * @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
@@ -43,7 +43,7 @@
 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 void init(ServletConfig sc) throws ServletException {
         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;