Formatting - line wrap > 120 in code

35 files changed, 152 insertions, 73 deletions

diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
index 352dd8415..7f85b6040 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
@@ -291,7 +291,8 @@ public class CMSEngine implements ICMSEngine {
                     try {
                         mPasswordStore = (IPasswordStore) Class.forName(pwdClass).newInstance();
                     } catch (Exception e) {
-                        CMS.debug("CMSEngine: getPasswordStore(): password store initialization failure:" + e.toString());
+                        CMS.debug("CMSEngine: getPasswordStore(): password store initialization failure:"
+                                + e.toString());
                     }
                 }
             } else {
@@ -1292,19 +1293,22 @@ public class CMSEngine implements ICMSEngine {
         return getLogMessage(msgID, params);
     }
 
-    public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7) {
+    public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+            String p7) {
         String params[] = { p1, p2, p3, p4, p5, p6, p7 };
 
         return getLogMessage(msgID, params);
     }
 
-    public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8) {
+    public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+            String p7, String p8) {
         String params[] = { p1, p2, p3, p4, p5, p6, p7, p8 };
 
         return getLogMessage(msgID, params);
     }
 
-    public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8, String p9) {
+    public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6,
+            String p7, String p8, String p9) {
         String params[] = { p1, p2, p3, p4, p5, p6, p7, p8, p9 };
 
         return getLogMessage(msgID, params);
@@ -1320,7 +1324,8 @@ public class CMSEngine implements ICMSEngine {
         GeneralNameUtil.SubjAltNameGN.getExtendedPluginInfo(name, params);
     }
 
-    public ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured) throws EBaseException {
+    public ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured)
+            throws EBaseException {
         return new GeneralNameUtil.SubjAltNameGN(name, config, isValueConfigured);
     }
 
@@ -1359,12 +1364,14 @@ public class CMSEngine implements ICMSEngine {
         return new GeneralNameUtil.GeneralNamesConfig(name, config, isValueConfigured, isPolicyEnabled);
     }
 
-    public IGeneralNameAsConstraintsConfig createGeneralNameAsConstraintsConfig(String name, IConfigStore config, boolean isValueConfigured,
+    public IGeneralNameAsConstraintsConfig createGeneralNameAsConstraintsConfig(String name, IConfigStore config,
+            boolean isValueConfigured,
             boolean isPolicyEnabled) throws EBaseException {
         return new GeneralNameUtil.GeneralNameAsConstraintsConfig(name, config, isValueConfigured, isPolicyEnabled);
     }
 
-    public IGeneralNamesAsConstraintsConfig createGeneralNamesAsConstraintsConfig(String name, IConfigStore config, boolean isValueConfigured,
+    public IGeneralNamesAsConstraintsConfig createGeneralNamesAsConstraintsConfig(String name, IConfigStore config,
+            boolean isValueConfigured,
             boolean isPolicyEnabled) throws EBaseException {
         return new GeneralNameUtil.GeneralNamesAsConstraintsConfig(name, config, isValueConfigured, isPolicyEnabled);
     }
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java
index 3ab522b7e..b5307c448 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java
+++ b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java
@@ -41,7 +41,8 @@ public final class Upgrade {
     public static void perform42to422(IConfigStore c)
             throws EBaseException {
         // upgrade CMS's configuration parameters
-        c.putString("eeGateway.dynamicVariables",
+        c.putString(
+                "eeGateway.dynamicVariables",
                 "serverdate=serverdate(),subsystemname=subsystemname(),http=http(),authmgrs=authmgrs(),clacrlurl=clacrlurl()");
 
         // new OCSP Publisher implemention
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java b/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
index e015c5e6c..64a09173f 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/authentication/AuthSubsystem.java
@@ -201,7 +201,8 @@ public class AuthSubsystem implements IAuthSubsystem {
 
                 if (plugin == null) {
                     log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTH_CANT_FIND_PLUGIN", implName));
-                    throw new EAuthMgrPluginNotFound(CMS.getUserMessage("CMS_AUTHENTICATION_AUTHMGR_NOT_FOUND", implName));
+                    throw new EAuthMgrPluginNotFound(CMS.getUserMessage("CMS_AUTHENTICATION_AUTHMGR_NOT_FOUND",
+                            implName));
                 }
                 String className = plugin.getClassPath();
 
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
index b2fc49b5d..84807430f 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
+++ b/pki/base/common/src/com/netscape/cmscore/authentication/CertUserDBAuthentication.java
@@ -175,7 +175,8 @@ public class CertUserDBAuthentication implements IAuthManager {
         try {
             user = (User) mCULocator.locateUser(certs);
         } catch (EUsrGrpException e) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTH_AGENT_AUTH_FAILED", x509Certs[0].getSerialNumber().toString(16), x509Certs[0].getSubjectDN().toString(), e.toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTH_AGENT_AUTH_FAILED", x509Certs[0].getSerialNumber()
+                    .toString(16), x509Certs[0].getSubjectDN().toString(), e.toString()));
             throw new EInvalidCredentials(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_CREDENTIAL"));
         } catch (netscape.ldap.LDAPException e) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTH_CANNOT_AGENT_AUTH", e.toString()));
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
index f2eb5afe1..2f8a33faa 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
+++ b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
@@ -186,7 +186,8 @@ public class ChallengePhraseAuthentication implements IAuthManager {
                 }
 
             } catch (NumberFormatException e) {
-                throw new EAuthUserError(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_ATTRIBUTE_VALUE", "Invalid serial number."));
+                throw new EAuthUserError(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_ATTRIBUTE_VALUE",
+                        "Invalid serial number."));
             }
         }
 
@@ -239,7 +240,8 @@ public class ChallengePhraseAuthentication implements IAuthManager {
                         bigIntArray = new BigInteger[1];
                         bigIntArray[0] = record.getSerialNumber();
                     } else
-                        throw new EAuthUserError(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_ATTRIBUTE_VALUE", "Invalid password."));
+                        throw new EAuthUserError(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_ATTRIBUTE_VALUE",
+                                "Invalid password."));
 
                 } else {
                     bigIntArray = new BigInteger[0];
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
index 13533200d..19438037b 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
+++ b/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java
@@ -124,7 +124,8 @@ public class SSLClientCertAuthentication implements IAuthManager {
             serialNum = (BigInteger) clientCert.getSerialNumber();
             //serialNum = new BigInteger(s.substring(2), 16);
         } catch (NumberFormatException e) {
-            throw new EAuthUserError(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_ATTRIBUTE_VALUE", "Invalid serial number."));
+            throw new EAuthUserError(CMS.getUserMessage("CMS_AUTHENTICATION_INVALID_ATTRIBUTE_VALUE",
+                    "Invalid serial number."));
         }
 
         String clientCertIssuerDN = clientCert.getIssuerDN().toString();
diff --git a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
index aa7e496ad..66bc508d5 100644
--- a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java
@@ -112,7 +112,8 @@ public class AuthzSubsystem implements IAuthzSubsystem {
                 if (plugin == null) {
                     log(ILogger.LL_FAILURE,
                             CMS.getLogMessage("CMSCORE_AUTHZ_PLUGIN_NOT_FOUND", implName));
-                    throw new EAuthzMgrPluginNotFound(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZMGR_PLUGIN_NOT_FOUND", implName));
+                    throw new EAuthzMgrPluginNotFound(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZMGR_PLUGIN_NOT_FOUND",
+                            implName));
                 } else {
                     CMS.debug(
                             CMS.getLogMessage("CMSCORE_AUTHZ_PLUGIN_FOUND", implName));
@@ -150,12 +151,14 @@ public class AuthzSubsystem implements IAuthzSubsystem {
                     log(ILogger.LL_FAILURE, CMS.getLogMessage("OPERATION_ERROR", errMsg));
                     throw new EAuthzException(CMS.getUserMessage("CMS_AUTHORIZATION_LOAD_CLASS_FAIL", className));
                 } catch (EBaseException e) {
-                    log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTHZ_PLUGIN_INIT_FAILED", insName, e.toString()));
+                    log(ILogger.LL_FAILURE,
+                            CMS.getLogMessage("CMSCORE_AUTHZ_PLUGIN_INIT_FAILED", insName, e.toString()));
                     // it is mis-configurated. This give
                     // administrator another chance to
                     // fix the problem via console
                 } catch (Throwable e) {
-                    log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTHZ_PLUGIN_INIT_FAILED", insName, e.toString()));
+                    log(ILogger.LL_FAILURE,
+                            CMS.getLogMessage("CMSCORE_AUTHZ_PLUGIN_INIT_FAILED", insName, e.toString()));
                     // Skip the authorization instance if
                     // it is mis-configurated. This give
                     // administrator another chance to
@@ -273,7 +276,8 @@ public class AuthzSubsystem implements IAuthzSubsystem {
 
         if (plugin == null) {
             log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_AUTHZ_PLUGIN_NOT_FOUND", implName));
-            throw new EAuthzMgrPluginNotFound(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZMGR_PLUGIN_NOT_FOUND", implName));
+            throw new EAuthzMgrPluginNotFound(CMS.getUserMessage("CMS_AUTHORIZATION_AUTHZMGR_PLUGIN_NOT_FOUND",
+                    implName));
         }
 
         // a temporary instance
diff --git a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
index ad56c2cdd..d587a81f5 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
+++ b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
@@ -395,7 +395,8 @@ public class PropConfigStore implements IConfigStore, Cloneable {
         } else if (value.equalsIgnoreCase("false")) {
             return false;
         } else {
-            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_PROPERTY_1", getName() + "." + name, "boolean", "\"true\" or \"false\""));
+            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_PROPERTY_1", getName() + "." + name,
+                    "boolean", "\"true\" or \"false\""));
         }
     }
 
@@ -458,7 +459,8 @@ public class PropConfigStore implements IConfigStore, Cloneable {
             CMS.traceHashKey(mDebugType, getFullName(name), value);
             return Integer.parseInt(value);
         } catch (NumberFormatException e) {
-            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_PROPERTY_1", getName() + "." + name, "int", "number"));
+            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_PROPERTY_1", getName() + "." + name, "int",
+                    "number"));
         }
     }
 
@@ -521,7 +523,8 @@ public class PropConfigStore implements IConfigStore, Cloneable {
             }
             return new BigInteger(value);
         } catch (NumberFormatException e) {
-            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_PROPERTY_1", getName() + "." + name, "BigInteger", "number"));
+            throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_PROPERTY_1", getName() + "." + name,
+                    "BigInteger", "number"));
         }
     }
 
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
index db6218b8f..ad5dd55ee 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
@@ -390,7 +390,8 @@ public class CertUtils {
         sb.append("\n");
         sb.append("Encryption Certificate Serial No: " + encryptionCert.getSerialNumber().toString(16).toUpperCase());
         sb.append("\n");
-        sb.append("Validity: From: " + signingCert.getNotBefore().toString() + "  To: " + signingCert.getNotAfter().toString());
+        sb.append("Validity: From: " + signingCert.getNotBefore().toString() + "  To: "
+                + signingCert.getNotAfter().toString());
         sb.append("\n");
         return new String(sb);
     }
@@ -918,7 +919,8 @@ public class CertUtils {
             }
             String certusage = config.getString(subsysType + ".cert." + tag + ".certusage", "");
             if (certusage.equals("")) {
-                CMS.debug("CertUtils: verifySystemCertByTag() certusage for cert tag " + tag + " undefined in CS.cfg, getting current certificate usage");
+                CMS.debug("CertUtils: verifySystemCertByTag() certusage for cert tag " + tag
+                        + " undefined in CS.cfg, getting current certificate usage");
             }
             r = verifySystemCertByNickname(nickname, certusage);
             if (r == true) {
@@ -1030,7 +1032,8 @@ public class CertUtils {
             }
             String certlist = config.getString(subsysType + ".cert.list", "");
             if (certlist.equals("")) {
-                CMS.debug("CertUtils: verifySystemCerts() " + subsysType + ".cert.list not defined in CS.cfg. System certificates verification not done");
+                CMS.debug("CertUtils: verifySystemCerts() " + subsysType
+                        + ".cert.list not defined in CS.cfg. System certificates verification not done");
                 auditMessage = CMS.getLogMessage(
                             LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION,
                             ILogger.SYSTEM_UID,
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java b/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
index 51f0b079a..b8f958be5 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/CertificatePair.java
@@ -168,7 +168,8 @@ public class CertificatePair implements ASN1Value {
             debug("got cacert public key bytes length=" + caCertBytes.length);
         else {
             debug("cacert public key bytes null");
-            throw new EBaseException("CertificatePair: certOrders() fails to get this CA's signing certificate public key encoded");
+            throw new EBaseException(
+                    "CertificatePair: certOrders() fails to get this CA's signing certificate public key encoded");
         }
 
         byte[] c1Bytes = c1.getPublicKey().getEncoded();
@@ -196,7 +197,8 @@ public class CertificatePair implements ASN1Value {
             return false;
         } else {
             debug("neither c1 nor c2 public key matches with this ca");
-            throw new EBaseException("CertificatePair: need correct forward and reverse relationship to construct CertificatePair");
+            throw new EBaseException(
+                    "CertificatePair: need correct forward and reverse relationship to construct CertificatePair");
         }
     }
 
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
index 25a3baef1..dbc0c607f 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/CrossCertPairSubsystem.java
@@ -439,7 +439,8 @@ public class CrossCertPairSubsystem implements ICrossCertPairSubsystem {
                             xp = (IXcertPublisherProcessor) mPublisherProcessor;
                             xp.publishXCertPair(val);
                         } catch (Exception e) {
-                            throw new EBaseException("CrossCertPairSubsystem: publishCertPairs() failed:" + e.toString());
+                            throw new EBaseException("CrossCertPairSubsystem: publishCertPairs() failed:"
+                                    + e.toString());
                         }
                     }
                 }// while
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
index 8f5964b71..f85d9016c 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/X500NameSubsystem.java
@@ -209,7 +209,8 @@ public class X500NameSubsystem implements ISubsystem {
             } catch (IllegalArgumentException e) {
                 String msg = "unknown DER tag '" + nextTag + "'.";
 
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CERT_UNKNOWN_TAG", PROP_DIR_STR_ENCODING_ORDER, nextTag));
+                log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("CMSCORE_CERT_UNKNOWN_TAG", PROP_DIR_STR_ENCODING_ORDER, nextTag));
                 throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_ATTR_VALUE",
                             PROP_DIR_STR_ENCODING_ORDER, msg));
             }
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
index 12f8fe73f..01bb0f879 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
+++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnFactory.java
@@ -64,7 +64,8 @@ public class HttpConnFactory {
      * @param maxConns max number of connections to have available. This is
      * @param serverInfo server connection info - host, port, etc.
      */
-    public HttpConnFactory(int minConns, int maxConns, IAuthority source, IRemoteAuthority dest, String nickname, int timeout) throws EBaseException {
+    public HttpConnFactory(int minConns, int maxConns, IAuthority source, IRemoteAuthority dest, String nickname,
+            int timeout) throws EBaseException {
 
         CMS.debug("In HttpConnFactory constructor mTimeout " + timeout);
         mSource = source;
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
index 5b07f2c65..95cdbc779 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
+++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnection.java
@@ -157,7 +157,10 @@ public class HttpConnection implements IHttpConnection {
             }
         } catch (IOException e) {
             if (e.getMessage().indexOf("Peer's certificate issuer has been marked as not trusted") != -1) {
-                throw new EBaseException(CMS.getUserMessage("CMS_BASE_CONN_FAILED", "(This local authority cannot connect to the remote authority. The local authority's signing certificate must chain to a CA certificate trusted for client authentication in the certificate database. Use the certificate manager, or command line tool such as certutil to verify that the trust permissions of the local authority's issuer cert have 'CT' setting in the SSL client auth field.)"));
+                throw new EBaseException(
+                        CMS.getUserMessage(
+                                "CMS_BASE_CONN_FAILED",
+                                "(This local authority cannot connect to the remote authority. The local authority's signing certificate must chain to a CA certificate trusted for client authentication in the certificate database. Use the certificate manager, or command line tool such as certutil to verify that the trust permissions of the local authority's issuer cert have 'CT' setting in the SSL client auth field.)"));
             }
             CMS.debug("HttpConn:Couldn't reconnect " + e);
             throw new EBaseException(CMS.getUserMessage("CMS_BASE_CONN_FAILED", "Couldn't reconnect " + e));
@@ -180,7 +183,8 @@ public class HttpConnection implements IHttpConnection {
                     mHttpClient.connect(mDest.getHost(), mDest.getPort());
                 } catch (IOException ex) {
                     CMS.debug("reconnect for resend failed. " + ex);
-                    throw new EBaseException(CMS.getUserMessage("CMS_BASE_CONN_FAILED", "reconnect for resend failed." + ex));
+                    throw new EBaseException(CMS.getUserMessage("CMS_BASE_CONN_FAILED", "reconnect for resend failed."
+                            + ex));
                 }
                 reconnect = true;
             }
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
index 1781e8fd9..8a05c1c74 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
+++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java
@@ -150,7 +150,8 @@ public class HttpConnector implements IConnector {
                     replyStatus == RequestStatus.APPROVED)) {
                 CMS.debug("HttpConn:  remote request id still pending " +
                         r.getRequestId() + " state " + replyStatus);
-                mSource.log(ILogger.LL_INFO, CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_NOT_COMPLETED", r.getRequestId().toString()));
+                mSource.log(ILogger.LL_INFO,
+                        CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_NOT_COMPLETED", r.getRequestId().toString()));
                 mResender.addRequest(r);
                 return false;
             }
@@ -186,7 +187,8 @@ public class HttpConnector implements IConnector {
                 mResender.addRequest(r);
 
             CMS.debug("HttpConn:  error sending request to cert " + e.toString());
-            mSource.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CONNECTOR_SEND_REQUEST", r.getRequestId().toString(), mDest.getHost(), Integer.toString(mDest.getPort())));
+            mSource.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CONNECTOR_SEND_REQUEST", r.getRequestId()
+                    .toString(), mDest.getHost(), Integer.toString(mDest.getPort())));
             // mSource.log(ILogger.LL_INFO, 
             //    "Queing " + r.getRequestId() + " for resend.");
             return false;
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
index 586f7f650..d32cf283c 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
+++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java
@@ -69,7 +69,8 @@ public class HttpPKIMessage implements IHttpPKIMessage {
         reqId = r.getRequestId().toString();
         reqStatus = r.getRequestStatus().toString();
 
-        CMS.debug("HttpPKIMessage.fromRequest: requestId=" + r.getRequestId().toString() + " requestStatus=" + reqStatus + " instance=" + r);
+        CMS.debug("HttpPKIMessage.fromRequest: requestId=" + r.getRequestId().toString() + " requestStatus="
+                + reqStatus + " instance=" + r);
 
         String attrs[] = RequestTransfer.getTransferAttributes(r);
         int len = attrs.length;
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java b/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
index da639c0b1..806ca57c3 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
+++ b/pki/base/common/src/com/netscape/cmscore/connector/LocalConnector.java
@@ -59,7 +59,8 @@ public class LocalConnector implements IConnector {
      */
     public boolean send(IRequest r) throws EBaseException {
         if (Debug.ON) {
-            Debug.print("send request type " + r.getRequestType() + " status=" + r.getRequestStatus() + " to " + mDest.getId() + " id=" + r.getRequestId() + "\n");
+            Debug.print("send request type " + r.getRequestType() + " status=" + r.getRequestStatus() + " to "
+                    + mDest.getId() + " id=" + r.getRequestId() + "\n");
         }
         CMS.debug("send request type " + r.getRequestType() +
                 " to " + mDest.getId());
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java b/pki/base/common/src/com/netscape/cmscore/connector/Resender.java
index 87764b7d8..edef41b8c 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/Resender.java
+++ b/pki/base/common/src/com/netscape/cmscore/connector/Resender.java
@@ -149,7 +149,8 @@ public class Resender implements IResender {
                 r = mQueue.findRequest(rid);
             } catch (EBaseException e) {
                 // XXX bad case. should we remove the rid now ? 
-                mAuthority.log(ILogger.LL_WARN, CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_NOT_FOUND", rid.toString()));
+                mAuthority.log(ILogger.LL_WARN,
+                        CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_NOT_FOUND", rid.toString()));
                 continue;
             }
             try {
@@ -163,11 +164,13 @@ public class Resender implements IResender {
 
                     if (completed) {
                         completedRids.addElement(rid);
-                        mAuthority.log(ILogger.LL_INFO, CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_COMPLETED", rid.toString()));
+                        mAuthority.log(ILogger.LL_INFO,
+                                CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_COMPLETED", rid.toString()));
                     }
                 }
             } catch (IOException e) {
-                mAuthority.log(ILogger.LL_WARN, CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_ERROR", rid.toString(), e.toString()));
+                mAuthority.log(ILogger.LL_WARN,
+                        CMS.getLogMessage("CMSCORE_CONNECTOR_REQUEST_ERROR", rid.toString(), e.toString()));
             } catch (EBaseException e) {
                 // if connection is down, don't send the remaining request
                 // as it will sure fail.
@@ -237,7 +240,8 @@ public class Resender implements IResender {
             return true;
         } catch (EBaseException e) {
             // same as not having sent it, so still want to resend.
-            mAuthority.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CONNECTOR_RESEND_ERROR", r.getRequestId().toString(), e.toString()));
+            mAuthority.log(ILogger.LL_FAILURE,
+                    CMS.getLogMessage("CMSCORE_CONNECTOR_RESEND_ERROR", r.getRequestId().toString(), e.toString()));
             if (e.toString().indexOf("Connection refused by peer") > 0)
                 throw new EBaseException("connection not available");
         }
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
index e27b710d5..5a5de68dc 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
@@ -105,9 +105,11 @@ public class CertificateRepository extends Repository
     public BigInteger getLastSerialNumberInRange(BigInteger serial_low_bound, BigInteger serial_upper_bound)
             throws EBaseException {
 
-        CMS.debug("CertificateRepository:  in getLastSerialNumberInRange: low " + serial_low_bound + " high " + serial_upper_bound);
+        CMS.debug("CertificateRepository:  in getLastSerialNumberInRange: low " + serial_low_bound + " high "
+                + serial_upper_bound);
 
-        if (serial_low_bound == null || serial_upper_bound == null || serial_low_bound.compareTo(serial_upper_bound) >= 0) {
+        if (serial_low_bound == null || serial_upper_bound == null
+                || serial_low_bound.compareTo(serial_upper_bound) >= 0) {
             return null;
 
         }
@@ -116,7 +118,8 @@ public class CertificateRepository extends Repository
 
         String[] attrs = null;
 
-        ICertRecordList recList = findCertRecordsInList(ldapfilter, attrs, serial_upper_bound.toString(10), "serialno", 5 * -1);
+        ICertRecordList recList = findCertRecordsInList(ldapfilter, attrs, serial_upper_bound.toString(10), "serialno",
+                5 * -1);
 
         int size = recList.getSize();
 
@@ -1654,7 +1657,8 @@ public class CertificateRepository extends Repository
             throws EBaseException {
         IDBSSession s = mDBService.createSession();
         Enumeration e = null;
-        String ldapfilter = "(|(" + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED + ")(" + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; // index is setup for this filter
+        String ldapfilter = "(|(" + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED + ")("
+                + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; // index is setup for this filter
 
         try {
             //e = s.search(getDN(), ldapfilter);
@@ -1716,7 +1720,8 @@ public class CertificateRepository extends Repository
             throws EBaseException {
         IDBSSession s = mDBService.createSession();
         Enumeration e = null;
-        String ldapfilter = "(&(|(" + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED + ")(" + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; // index is setup for this filter
+        String ldapfilter = "(&(|(" + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED + ")("
+                + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; // index is setup for this filter
 
         ldapfilter += "(certMetainfo=" +
                 CertRecord.META_LDAPPUBLISH +
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
index b9f338c43..934cf1ea0 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java
@@ -535,7 +535,8 @@ public class DBVirtualList<E> implements IDBVirtualList<E> {
                 //       ".." + (mTop+mEntries.size()-1) +
                 //      " of " + mSize );
             } else {
-                mLogger.log(ILogger.EV_SYSTEM, ILogger.S_DB, ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_DBS_VL_NULL_RESPONSE"));
+                mLogger.log(ILogger.EV_SYSTEM, ILogger.S_DB, ILogger.LL_FAILURE,
+                        CMS.getLogMessage("CMSCORE_DBS_VL_NULL_RESPONSE"));
             }
             return true;
         } catch (Exception e) {
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
index fc2d2c10a..b9cb2bdf2 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
@@ -449,16 +449,19 @@ public class KeyRepository extends Repository implements IKeyRepository {
     public BigInteger getLastSerialNumberInRange(BigInteger serial_low_bound, BigInteger serial_upper_bound) throws
             EBaseException {
 
-        CMS.debug("KeyRepository:  in getLastSerialNumberInRange: low " + serial_low_bound + " high " + serial_upper_bound);
+        CMS.debug("KeyRepository:  in getLastSerialNumberInRange: low " + serial_low_bound + " high "
+                + serial_upper_bound);
 
-        if (serial_low_bound == null || serial_upper_bound == null || serial_low_bound.compareTo(serial_upper_bound) >= 0) {
+        if (serial_low_bound == null || serial_upper_bound == null
+                || serial_low_bound.compareTo(serial_upper_bound) >= 0) {
             return null;
         }
 
         String ldapfilter = "(" + "serialno" + "=*" + ")";
         String[] attrs = null;
 
-        KeyRecordList recList = (KeyRecordList) findKeyRecordsInList(ldapfilter, attrs, serial_upper_bound.toString(10), "serialno", 5 * -1);
+        KeyRecordList recList = (KeyRecordList) findKeyRecordsInList(ldapfilter, attrs,
+                serial_upper_bound.toString(10), "serialno", 5 * -1);
 
         int size = recList.getSize();
 
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
index c016e5acd..87f962faa 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/ReplicaIDRepository.java
@@ -54,8 +54,10 @@ public class ReplicaIDRepository extends Repository
      */
     public BigInteger getLastSerialNumberInRange(BigInteger serial_low_bound, BigInteger serial_upper_bound)
             throws EBaseException {
-        CMS.debug("ReplicaIDReposoitory: in getLastSerialNumberInRange: low " + serial_low_bound + " high " + serial_upper_bound);
-        if (serial_low_bound == null || serial_upper_bound == null || serial_low_bound.compareTo(serial_upper_bound) >= 0) {
+        CMS.debug("ReplicaIDReposoitory: in getLastSerialNumberInRange: low " + serial_low_bound + " high "
+                + serial_upper_bound);
+        if (serial_low_bound == null || serial_upper_bound == null
+                || serial_low_bound.compareTo(serial_upper_bound) >= 0) {
             return null;
         }
         BigInteger ret = new BigInteger(getMinSerial());
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java b/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java
index 106a1c214..b89f388ce 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java
@@ -496,6 +496,7 @@ public abstract class Repository implements IRepository {
         mDB.setEnableSerialMgmt(value);
     }
 
-    public abstract BigInteger getLastSerialNumberInRange(BigInteger serial_low_bound, BigInteger serial_upper_bound) throws
+    public abstract BigInteger getLastSerialNumberInRange(BigInteger serial_low_bound, BigInteger serial_upper_bound)
+            throws
             EBaseException;
 }
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java b/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java
index 6dd38f2ba..a4ed727da 100644
--- a/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java
+++ b/pki/base/common/src/com/netscape/cmscore/jobs/CronItem.java
@@ -128,7 +128,8 @@ public class CronItem {
                         if (!cr.isValidRange(mMin, mMax)) {
                             // throw...
                             log(ILogger.LL_FAILURE,
-                                    CMS.getLogMessage("CMSCORE_JOBS_INVALID_MIN_MAX_RANGE", Integer.toString(mMin), Integer.toString(mMax)));
+                                    CMS.getLogMessage("CMSCORE_JOBS_INVALID_MIN_MAX_RANGE", Integer.toString(mMin),
+                                            Integer.toString(mMax)));
                             throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_JOB_CRON"));
                         }
                         //						System.out.println("CronItem set(): adding a number");
diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java
index 92f082a2f..eeca68f63 100644
--- a/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java
+++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobCron.java
@@ -131,14 +131,16 @@ public class JobCron implements IJobCron {
          * the '*' one will remain empty (no elements)
          */
         // day-of-week
-        if ((sDayOMonth != null) && sDayOMonth.equals(CronItem.ALL) && (sDayOWeek != null) && !sDayOWeek.equals(CronItem.ALL)) {
+        if ((sDayOMonth != null) && sDayOMonth.equals(CronItem.ALL) && (sDayOWeek != null)
+                && !sDayOWeek.equals(CronItem.ALL)) {
             try {
                 cDOW.set(sDayOWeek);
             } catch (EBaseException e) {
                 log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_JOBS_INVALID_DAY_OF_WEEK", e.toString()));
                 throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_JOB_CRON"));
             }
-        } else if ((sDayOMonth != null) && !sDayOMonth.equals(CronItem.ALL) && (sDayOWeek != null) && sDayOWeek.equals(CronItem.ALL)) {
+        } else if ((sDayOMonth != null) && !sDayOMonth.equals(CronItem.ALL) && (sDayOWeek != null)
+                && sDayOWeek.equals(CronItem.ALL)) {
             try {
                 cDOM.set(sDayOMonth);
             } catch (EBaseException e) {
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
index 3d44063d9..2f6cadf68 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
+++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRequestListener.java
@@ -477,8 +477,10 @@ class LdapUnrevocationListener implements IRequestListener {
                         try {
                             certRecord = (ICertRecord) certdb.readCertificateRecord(serial);
                         } catch (EBaseException e) {
-                            mProcessor.log(ILogger.LL_FAILURE,
-                                    CMS.getLogMessage("CMSCORE_LDAP_GET_CERT_RECORD", serial.toString(16), e.toString()));
+                            mProcessor
+                                    .log(ILogger.LL_FAILURE,
+                                            CMS.getLogMessage("CMSCORE_LDAP_GET_CERT_RECORD", serial.toString(16),
+                                                    e.toString()));
                         }
                     }
                 }
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
index a65e6bb04..f3d2bd17f 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
+++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapRule.java
@@ -85,7 +85,8 @@ public class LdapRule implements ILdapRule, IExtendedPluginInfo {
         epi_params = new String[] {
                     "type;choice(cacert,crl, certs);The publishing object type",
                     "mapper;choice(" + map + ");Use the mapper to find the ldap dn \nto publish the certificate or crl",
-                    "publisher;choice(" + publish + ");Use the publisher to publish the certificate or crl a directory etc",
+                    "publisher;choice(" + publish
+                            + ");Use the publisher to publish the certificate or crl a directory etc",
                     "enable;boolean;Enable this publishing rule",
                     "predicate;string;Filter describing when this publishing rule shoule be used"
                 };
diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
index 7ee489ff8..73d206981 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
+++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
@@ -838,9 +838,15 @@ public class PublisherProcessor implements
         } catch (EBaseException e) {
             // not fatal. just log warning.
             log(ILogger.LL_WARN,
-                    "Cannot mark cert 0x" + serialNo.toString(16) + " published as " + published +
-                            " in the ldap directory. Cert Record not found. Error: " +
-                            e.toString() +
+                    "Cannot mark cert 0x"
+                            + serialNo.toString(16)
+                            + " published as "
+                            + published
+                            +
+                            " in the ldap directory. Cert Record not found. Error: "
+                            +
+                            e.toString()
+                            +
                             " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. Otherwise your internal db may be corrupted.");
         }
     }
@@ -1117,7 +1123,8 @@ public class PublisherProcessor implements
         Enumeration<ILdapRule> rules = getRules("certs", req);
 
         if (rules == null || !rules.hasMoreElements()) {
-            log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_NO_UNPUBLISHING_RULE_FOUND_FOR_REQUEST", "certs", req.getRequestId().toString()));
+            log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_NO_UNPUBLISHING_RULE_FOUND_FOR_REQUEST", "certs",
+                    req.getRequestId().toString()));
             throw new ELdapException(CMS.getUserMessage("CMS_LDAP_NO_RULE_MATCHED",
                     req.getRequestId().toString()));
         }
@@ -1221,7 +1228,8 @@ public class PublisherProcessor implements
                         dn = result;
                         if (!mCreateOwnDNEntry) {
                             if (dn == null) {
-                                log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_MAPPER_NOT_MAP", rule.getMapper()));
+                                log(ILogger.LL_FAILURE,
+                                        CMS.getLogMessage("CMSCORE_LDAP_MAPPER_NOT_MAP", rule.getMapper()));
                                 throw new ELdapException(CMS.getUserMessage("CMS_LDAP_NO_MATCH",
                                         crl.getIssuerDN().toString()));
 
@@ -1231,7 +1239,8 @@ public class PublisherProcessor implements
                     publisher = getActivePublisherInstance(rule.getPublisher());
                     if (publisher != null) {
                         if (publisher instanceof com.netscape.cms.publish.publishers.FileBasedPublisher)
-                            ((com.netscape.cms.publish.publishers.FileBasedPublisher) publisher).setIssuingPointId(crlIssuingPointId);
+                            ((com.netscape.cms.publish.publishers.FileBasedPublisher) publisher)
+                                    .setIssuingPointId(crlIssuingPointId);
                         publisher.publish(conn, dn, crl);
                         log(ILogger.LL_INFO, "published crl using rule=" + rule.getInstanceName());
                     }
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java b/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
index 46bd1ffc4..a5ce83251 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
+++ b/pki/base/common/src/com/netscape/cmscore/logging/AuditFormat.java
@@ -75,13 +75,16 @@ public class AuditFormat {
     public static final String ENROLLMENTFORMAT =
             IRequest.ENROLLMENT_REQUEST + " reqID {0} {1} authenticated by {2} is {3}. DN requested: {4} {5}";
     public static final String RENEWALFORMAT =
-            IRequest.RENEWAL_REQUEST + " reqID {0} {1} authenticated by {2} is {3}. DN requested: {4} old serial number: 0x{5} {6}";
+            IRequest.RENEWAL_REQUEST
+                    + " reqID {0} {1} authenticated by {2} is {3}. DN requested: {4} old serial number: 0x{5} {6}";
     public static final String REVOCATIONFORMAT =
-            IRequest.REVOCATION_REQUEST + " reqID {0} {1} authenticated by {2} is {3}. DN requested: {4} serial number: 0x{5} revocation reason: {6} {7}";
+            IRequest.REVOCATION_REQUEST
+                    + " reqID {0} {1} authenticated by {2} is {3}. DN requested: {4} serial number: 0x{5} revocation reason: {6} {7}";
 
     // 1: fromAgent AgentID: xxx authenticated by xxx
     public static final String DOREVOKEFORMAT =
-            IRequest.REVOCATION_REQUEST + " reqID {0} {1} is {2}. DN requested: {3} serial number: 0x{4} revocation reason: {5}";
+            IRequest.REVOCATION_REQUEST
+                    + " reqID {0} {1} is {2}. DN requested: {3} serial number: 0x{4} revocation reason: {5}";
     // 1: fromAgent AgentID: xxx authenticated by xxx
     public static final String DOUNREVOKEFORMAT =
             IRequest.UNREVOCATION_REQUEST + " reqID {0} {1} is {2}. DN requested: {3} serial number: 0x{4}";
diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
index a8bc67c0d..83cd0c99c 100644
--- a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java
@@ -139,7 +139,8 @@ public class LogSubsystem implements ILogSubsystem {
                 throw new EBaseException(insName + ":Failed to instantiate class " + className);
             } catch (Throwable e) {
                 e.printStackTrace();
-                throw new EBaseException(insName + ":Failed to instantiate class " + className + " error: " + e.getMessage());
+                throw new EBaseException(insName + ":Failed to instantiate class " + className + " error: "
+                        + e.getMessage());
             }
 
             if (insName == null) {
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 8fe2863d4..14062e9d4 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
+++ b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
@@ -382,7 +382,8 @@ public class GeneralNameUtil implements IGeneralNameUtil {
 
     }
 
-    static public class GeneralNamesAsConstraintsConfig extends GeneralNamesConfig implements IGeneralNamesAsConstraintsConfig {
+    static public class GeneralNamesAsConstraintsConfig extends GeneralNamesConfig implements
+            IGeneralNamesAsConstraintsConfig {
         public GeneralNamesAsConstraintsConfig(
                 String name,
                 IConfigStore config,
@@ -596,7 +597,8 @@ public class GeneralNameUtil implements IGeneralNameUtil {
     /**
      * convenience class for policies use.
      */
-    static public class GeneralNameAsConstraintsConfig extends GeneralNameConfig implements IGeneralNameAsConstraintsConfig {
+    static public class GeneralNameAsConstraintsConfig extends GeneralNameConfig implements
+            IGeneralNameAsConstraintsConfig {
 
         public GeneralNameAsConstraintsConfig(
                 String name,
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 ab85bb80d..2423773a8 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
+++ b/pki/base/common/src/com/netscape/cmscore/policy/GenericPolicyProcessor.java
@@ -320,7 +320,8 @@ public class GenericPolicyProcessor implements IPolicyProcessor {
                     ((IPolicyRule) rule).setInstanceName(instanceName);
                 rule.init(this, c);
             } catch (Throwable e) {
-                mAuthority.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_POLICY_INIT_FAILED", instanceName, e.toString()));
+                mAuthority.log(ILogger.LL_FAILURE,
+                        CMS.getLogMessage("CMSCORE_POLICY_INIT_FAILED", instanceName, e.toString()));
                 // disable rule initialized if there is 
                 // configuration error
                 enabled = false;
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 ca629b4be..37780cfc2 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java
+++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java
@@ -229,9 +229,12 @@ public class PolicySet implements IPolicySet {
                 // The policy may have bug. We want to
                 // catch those problems and report
                 // them to the log
-                mLogger.log(ILogger.EV_SYSTEM, ILogger.S_OTHER,
+                mLogger.log(
+                        ILogger.EV_SYSTEM,
+                        ILogger.S_OTHER,
                         ILogger.LL_FAILURE,
-                        CMS.getLogMessage("CMSCORE_POLICY_ERROR_RESULT", req.getRequestId().toString(), name, ex.toString()));
+                        CMS.getLogMessage("CMSCORE_POLICY_ERROR_RESULT", req.getRequestId().toString(), name,
+                                ex.toString()));
                 // treat as rejected to prevent request from going into 
                 // a weird state. request queue doesn't handle this case.
                 rejected = true;
diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index cdf4784ae..aa80a3ceb 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
@@ -1447,7 +1447,8 @@ public final class JssSubsystem implements ICryptoSubsystem {
                         pair.setValue(vvalue + ";" + certValue);
                     }
                 } catch (CertificateException e) {
-                    log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_SECURITY_GET_CA_CERT_FOR", nickname, e.toString()));
+                    log(ILogger.LL_FAILURE,
+                            CMS.getLogMessage("CMSCORE_SECURITY_GET_CA_CERT_FOR", nickname, e.toString()));
                     // allow it to continue with other certs even if one blows
                     // up
                     //            throw new EBaseException(BaseResources.CERT_ERROR);
diff --git a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java b/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java
index 1324f6caa..57803c9e5 100644
--- a/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java
+++ b/pki/base/common/src/com/netscape/cmscore/util/UtilResources.java
@@ -60,7 +60,8 @@ public class UtilResources extends ListResourceBundle {
             { NO_SUCH_FILE_1, "can''t find file {0}" },
             { FILE_TRUNCATED, "Log file has been truncated." },
             { DIGEST_MATCH_1, "Hash digest matches log file. {0} OK" },
-            { DIGEST_DONT_MATCH_1, "Hash digest does NOT match log file. {0} and/or hash file is corrupt or the password is incorrect." },
+            { DIGEST_DONT_MATCH_1,
+                    "Hash digest does NOT match log file. {0} and/or hash file is corrupt or the password is incorrect." },
             { EXCEPTION_1, "Caught unexpected exception {0}" },
             { LOG_PASSWORD, "Please enter the log file hash digest password: " },
             { NO_USERID, "No user id in config file.  Running as {0}" },