Formatting - fix bad wrapsticket-2

Resolve conflict in pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java

27 files changed, 124 insertions, 261 deletions

diff --git a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
index db8e716e..74c3eb15 100644
--- a/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
+++ b/pki/base/ca/src/com/netscape/ca/CMSCRLExtensions.java
@@ -432,8 +432,8 @@ public class CMSCRLExtensions implements ICMSCRLExtensions {
     }
 
     public boolean isCRLExtensionEnabled(String extName) {
-        return ((mCRLExtensionNames.contains(extName) || mCRLEntryExtensionNames.contains(extName)) && mEnabledCRLExtensions
-                .contains(extName));
+        return ((mCRLExtensionNames.contains(extName) || mCRLEntryExtensionNames.contains(extName)) && 
+                mEnabledCRLExtensions.contains(extName));
     }
 
     public boolean isCRLExtensionCritical(String extName) {
diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
index fed3f5aa..90aec24c 100644
--- a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
+++ b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
@@ -2220,8 +2220,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable {
     public boolean isDeltaCRLEnabled() {
         return (mAllowExtensions && mEnableCRLCache &&
                 mCMSCRLExtensions.isCRLExtensionEnabled(DeltaCRLIndicatorExtension.class.getSimpleName()) &&
-                mCMSCRLExtensions.isCRLExtensionEnabled(CRLNumberExtension.class.getSimpleName()) && mCMSCRLExtensions
-                .isCRLExtensionEnabled(CRLReasonExtension.class.getSimpleName()));
+                mCMSCRLExtensions.isCRLExtensionEnabled(CRLNumberExtension.class.getSimpleName()) && 
+                mCMSCRLExtensions.isCRLExtensionEnabled(CRLReasonExtension.class.getSimpleName()));
     }
 
     public boolean isThisCurrentDeltaCRL(X509CRLImpl deltaCRL) {
diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
index 98b2e2b8..99faa92f 100644
--- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
+++ b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java
@@ -233,8 +233,8 @@ public class ARequestNotifier implements IRequestNotifier {
                     if (!(requestType.equals(IRequest.ENROLLMENT_REQUEST) ||
                             requestType.equals(IRequest.RENEWAL_REQUEST) ||
                             requestType.equals(IRequest.REVOCATION_REQUEST) ||
-                            requestType.equals(IRequest.CMCREVOKE_REQUEST) || requestType
-                            .equals(IRequest.UNREVOCATION_REQUEST))) {
+                            requestType.equals(IRequest.CMCREVOKE_REQUEST) || 
+                            requestType.equals(IRequest.UNREVOCATION_REQUEST))) {
                         continue;
                     }
                     if (i == 0 && id.equals(r.getRequestId().toString())) {
diff --git a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
index e96af389..fef4d73e 100644
--- a/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
+++ b/pki/base/common/src/com/netscape/certsrv/util/HttpInput.java
@@ -174,9 +174,8 @@ public class HttpInput {
                 return i;
             else {
                 throw new IOException(
-                        "Invalid key length '"
-                                + i
-                                + "'. Please consult your security officer for a proper length, or take the default value. Here are examples of some commonly used key lengths: 256, 384, 521.");
+                        "Invalid key length '" + i
+                        + "'. Please consult your security officer for a proper length, or take the default value. Here are examples of some commonly used key lengths: 256, 384, 521.");
             }
             /*
              * 
diff --git a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
index ac1d870d..0db2c53e 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
@@ -159,9 +159,8 @@ public class CMCAuth implements IAuthManager, IExtendedPluginInfo,
         mExtendedPluginInfo = new Vector();
 
         mExtendedPluginInfo
-                .add(IExtendedPluginInfo.HELP_TEXT
-                        +
-                        ";Authenticate the CMC request. The signer must be an agent. The \"Authentication Instance ID\" must be named \"CMCAuth\"");
+                .add(IExtendedPluginInfo.HELP_TEXT +
+                    ";Authenticate the CMC request. The signer must be an agent. The \"Authentication Instance ID\" must be named \"CMCAuth\"");
         mExtendedPluginInfo.add(IExtendedPluginInfo.HELP_TOKEN +
                 ";configuration-authentication");
     }
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
index 4f6e1042..7292dbbf 100644
--- a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
+++ b/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java
@@ -119,8 +119,8 @@ public class CMSHoldInstructionExtension
         }
         if (instruction != null) {
             if (!(instruction.equalsIgnoreCase(PROP_INSTR_NONE) ||
-                    instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || instruction
-                    .equalsIgnoreCase(PROP_INSTR_REJECT))) {
+                    instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || 
+                    instruction.equalsIgnoreCase(PROP_INSTR_REJECT))) {
                 instruction = PROP_INSTR_NONE;
             }
         } else {
diff --git a/pki/base/common/src/com/netscape/cms/logging/LogFile.java b/pki/base/common/src/com/netscape/cms/logging/LogFile.java
index f8de4616..3da138ba 100644
--- a/pki/base/common/src/com/netscape/cms/logging/LogFile.java
+++ b/pki/base/common/src/com/netscape/cms/logging/LogFile.java
@@ -1482,8 +1482,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo {
                             ";boolean;Enable audit logs to be signed",
                     PROP_SIGNED_AUDIT_CERT_NICKNAME +
                             ";string;The nickname of the certificate to be used to sign audit logs",
-                    PROP_SIGNED_AUDIT_EVENTS
-                            +
+                    PROP_SIGNED_AUDIT_EVENTS +
                             ";string;A comma-separated list of strings used to specify particular signed audit log events",
             };
 
diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
index 378ae2f9..a23d8184 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
+++ b/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
@@ -156,8 +156,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli
 
                 if (certSubjectName.equalsIgnoreCase(mIssuerNameStr)) {
                     log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_SUBJECT_NAME_EXIST_1", mIssuerNameStr));
-                    setError(
-                            req,
+                    setError(req, 
                             CMS.getUserMessage("CMS_POLICY_SUBJECT_NAME_EXIST", NAME + ":" + "Same As Issuer Name "
                                     + mIssuerNameStr), "");
                     result = PolicyResult.REJECTED;
diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
index 93867b31..58f8a511 100644
--- a/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
+++ b/pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
@@ -123,195 +123,75 @@ public class GenericASN1Ext extends APolicyRule implements
                 PROP_OID + ";string;OID number for this extension. It should be unique.",
                 PROP_PATTERN + ";string;Pattern for extension; {012}34",
                 // Attribute 0
-                PROP_ATTRIBUTE
-                        + "."
-                        + "0"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "0"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "0"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "0" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "0" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "0" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 1
-                PROP_ATTRIBUTE
-                        + "."
-                        + "1"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "1"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "1"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "1" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "1" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "1" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 2
-                PROP_ATTRIBUTE
-                        + "."
-                        + "2"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "2"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "2"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "2" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "2" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "2" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 3
-                PROP_ATTRIBUTE
-                        + "."
-                        + "3"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "3"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "3"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "3" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "3" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "3" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 4
-                PROP_ATTRIBUTE
-                        + "."
-                        + "4"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "4"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "4"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "4" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "4" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "4" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 5
-                PROP_ATTRIBUTE
-                        + "."
-                        + "5"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "5"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "5"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "5" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "5" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "5" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 6
-                PROP_ATTRIBUTE
-                        + "."
-                        + "6"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "6"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "6"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "6" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "6" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "6" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 7
-                PROP_ATTRIBUTE
-                        + "."
-                        + "7"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "7"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "7"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "7" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "7" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "7" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 8
-                PROP_ATTRIBUTE
-                        + "."
-                        + "8"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "8"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "8"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "8" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "8" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "8" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 // Attribute 9
-                PROP_ATTRIBUTE
-                        + "."
-                        + "9"
-                        + "."
-                        + PROP_TYPE
-                        + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "9"
-                        + "."
-                        + PROP_SOURCE
-                        + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
-                PROP_ATTRIBUTE
-                        + "."
-                        + "9"
-                        + "."
-                        + PROP_VALUE
-                        + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
+                PROP_ATTRIBUTE + "." + "9" + "." + PROP_TYPE
+                    + ";choice(Integer,IA5String,OctetString,PrintableString,VisibleString,UTCTime,OID,Boolean);Attribute type for extension",
+                PROP_ATTRIBUTE + "." + "9" + "." + PROP_SOURCE
+                    + ";choice(Value,File);Data Source for the extension. You can specify the value here or file name has value.",
+                PROP_ATTRIBUTE + "." + "9" + "." + PROP_VALUE
+                    + ";string;If data source is 'value', specity value here. If data source is 'file', specify the file name with full path.",
                 IExtendedPluginInfo.HELP_TOKEN +
                         ";configuration-policyrules-genericasn1ext",
                 IExtendedPluginInfo.HELP_TEXT +
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
index a412eef3..a4621e73 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
+++ b/pki/base/common/src/com/netscape/cms/profile/common/BasicProfile.java
@@ -881,8 +881,8 @@ public abstract class BasicProfile implements IProfile {
                 // noDefaultImpl, genericExtDefaultImpl
 
                 if ((curDefaultClassId.equals(defaultClassId) &&
-                        !curDefaultClassId.equals(PROP_NO_DEFAULT) && !curDefaultClassId
-                        .equals(PROP_GENERIC_EXT_DEFAULT))) {
+                        !curDefaultClassId.equals(PROP_NO_DEFAULT) && 
+                        !curDefaultClassId.equals(PROP_GENERIC_EXT_DEFAULT))) {
 
                     matches++;
                     if (createConfig) {
diff --git a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
index 7f4a7692..086921fa 100644
--- a/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
+++ b/pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
@@ -376,8 +376,8 @@ public abstract class EnrollProfile extends BasicProfile
 
             org.mozilla.jss.pkix.cms.ContentInfo cmcReq = (org.mozilla.jss.pkix.cms.ContentInfo)
                     org.mozilla.jss.pkix.cms.ContentInfo.getTemplate().decode(cmcBlobIn);
-            org.mozilla.jss.pkix.cms.SignedData cmcFullReq = (org.mozilla.jss.pkix.cms.SignedData) cmcReq
-                    .getInterpretedContent();
+            org.mozilla.jss.pkix.cms.SignedData cmcFullReq = 
+                (org.mozilla.jss.pkix.cms.SignedData) cmcReq.getInterpretedContent();
             org.mozilla.jss.pkix.cms.EncapsulatedContentInfo ci = cmcFullReq.getContentInfo();
             OBJECT_IDENTIFIER id = ci.getContentType();
             OCTET_STRING content = ci.getContent();
diff --git a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
index 80b4acbe..1d43562b 100644
--- a/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
+++ b/pki/base/common/src/com/netscape/cms/publish/mappers/LdapSimpleMap.java
@@ -202,8 +202,8 @@ public class LdapSimpleMap implements ILdapMapper, IExtendedPluginInfo {
             LDAPEntry entry = results.next();
 
             if (results.hasMoreElements()) {
-                log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_MORE_THAN_ONE_ENTRY", dn, ((req == null) ? "" : req
-                        .getRequestId().toString())));
+                log(ILogger.LL_FAILURE, CMS.getLogMessage("PUBLISH_MORE_THAN_ONE_ENTRY", dn, ((req == null) ? "" : 
+                        req.getRequestId().toString())));
                 throw new ELdapException(CMS.getUserMessage("CMS_LDAP_MORE_THAN_ONE_ENTRY",
                             ((req == null) ? "" : req.getRequestId().toString())));
             }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
index e830fae9..c3e48452 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
@@ -372,8 +372,8 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
                 Vector<String> serialNumbers = new Vector<String>();
 
                 if (revokeAll != null && revokeAll.length() > 0) {
-                    for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = revokeAll
-                            .indexOf('=', i)) {
+                    for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; 
+                            i = revokeAll.indexOf('=', i)) {
                         if (i > -1) {
                             i++;
                             while (i < revokeAll.length() && revokeAll.charAt(i) == ' ') {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
index 4e2d81b8..3a0a52dd 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
@@ -533,8 +533,8 @@ public class DoRevoke extends CMSServlet {
                 Vector<String> serialNumbers = new Vector<String>();
 
                 if (revokeAll != null && revokeAll.length() > 0) {
-                    for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; i = revokeAll
-                            .indexOf('=', i)) {
+                    for (int i = revokeAll.indexOf('='); i < revokeAll.length() && i > -1; 
+                            i = revokeAll.indexOf('=', i)) {
                         if (i > -1) {
                             i++;
                             while (i < revokeAll.length() && revokeAll.charAt(i) == ' ') {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
index d4e2dcbb..fa7ef42d 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCertFromRequest.java
@@ -205,8 +205,8 @@ public class GetCertFromRequest extends CMSServlet {
             }
         }
 
-        if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || (r.getRequestType()
-                .equals(IRequest.RENEWAL_REQUEST)))) {
+        if (!((r.getRequestType().equals(IRequest.ENROLLMENT_REQUEST)) || 
+                (r.getRequestType().equals(IRequest.RENEWAL_REQUEST)))) {
             log(ILogger.LL_FAILURE,
                     CMS.getLogMessage("CMSGW_REQUEST_NOT_ENROLLMENT_1", requestId));
             throw new ECMSGWException(
diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
index 338e2e83..fd8768ce 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java
@@ -1203,8 +1203,8 @@ public class ProfileSubmitServlet extends ProfileServlet {
                 // no profile set found
                 CMS.debug("ProfileSubmitServlet: no profile policy set found");
                 if (xmlOutput) {
-                    outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), reqs[k]
-                            .getRequestId().toString());
+                    outputError(response, FAILED, CMS.getUserMessage("CMS_PROFILE_NO_POLICY_SET_FOUND"), 
+                            reqs[k].getRequestId().toString());
                 } else {
                     args.set(ARG_ERROR_CODE, "1");
                     args.set(ARG_ERROR_REASON,
@@ -1253,8 +1253,8 @@ public class ProfileSubmitServlet extends ProfileServlet {
                 // throw new IOException("Profile " + profileId +
                 // " cannot populate");
                 if (xmlOutput) {
-                    outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), reqs[k]
-                            .getRequestId().toString());
+                    outputError(response, FAILED, CMS.getUserMessage(locale, "CMS_INTERNAL_ERROR"), 
+                            reqs[k].getRequestId().toString());
                 } else {
                     args.set(ARG_ERROR_CODE, "1");
                     args.set(ARG_ERROR_REASON, CMS.getUserMessage(locale,
diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java b/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
index e889c73f..8453f38e 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
@@ -446,9 +446,8 @@ public class CertReqParser extends ReqParser {
                                     (CertificateValidity)
                                     certInfo[0].get(X509CertInfo.VALIDITY);
                             if (validity != null) {
-                                long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - ((Date) validity
-                                        .get(CertificateValidity.NOT_BEFORE)).getTime()) / 1000;
-
+                                long validityLength = (((Date) validity.get(CertificateValidity.NOT_AFTER)).getTime() - 
+                                        ((Date) validity.get(CertificateValidity.NOT_BEFORE)).getTime()) / 1000;
                                 arg.addLongValue("validityLength", validityLength);
                             }
                         } catch (IOException e) {
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 6b5ca312..9b709cfd 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
@@ -1653,13 +1653,9 @@ public class CertificateRepository extends Repository
             throws EBaseException {
         IDBSSession s = mDBService.createSession();
         Enumeration e = null;
+        // 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
+                + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; 
 
         try {
             // e = s.search(getDN(), ldapfilter);
@@ -1721,13 +1717,9 @@ public class CertificateRepository extends Repository
             throws EBaseException {
         IDBSSession s = mDBService.createSession();
         Enumeration e = null;
+        // 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
+                + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; 
 
         ldapfilter += "(certMetainfo=" +
                 CertRecord.META_LDAPPUBLISH +
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 d7f5656a..87fa9038 100644
--- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
+++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java
@@ -835,16 +835,12 @@ 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()
-                            +
-                            " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. Otherwise your internal db may be corrupted.");
+                    "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.");
         }
     }
 
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java
index 8bb04d1e..e2b1a363 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCResponse.java
@@ -211,8 +211,8 @@ public class CMCResponse {
 
     private static void printUsage() {
         System.out.println("");
-        System.out
-                .println("Usage: CMCResponse -d <pathname for cert8.db> -i <pathname for CMC response in binary format> ");
+        System.out.println(
+                "Usage: CMCResponse -d <pathname for cert8.db> -i <pathname for CMC response in binary format> ");
     }
 
     public static void main(String args[]) {
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java b/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
index 40271df0..ade7bd76 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
@@ -95,8 +95,8 @@ public class GenIssuerAltNameExt {
 
     public static void doUsage() {
         System.out.println();
-        System.out
-                .println("Usage:  GenIssuerAltNameExt <general_type0> <general_name0> ... <general_typeN> <general_nameN>");
+        System.out.println(
+                "Usage:  GenIssuerAltNameExt <general_type0> <general_name0> ... <general_typeN> <general_nameN>");
         System.out.println("where,");
         System.out.println("<general_type> can be one of the following string:");
         System.out.println("\tDNSName");
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java b/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
index ac260e91..eb1fff18 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
@@ -197,8 +197,8 @@ public class OCSPClient {
         System.out.println("  <port>     = OCSP server port number");
         System.out.println("  <dbdir>    = Certificate Database Directory");
         System.out.println("  <nickname> = Nickname of CA Certificate");
-        System.out
-                .println("  <serialno_or_filename> = Serial Number Being Checked, Or Name of file that contains the request");
+        System.out.println(
+                "  <serialno_or_filename> = Serial Number Being Checked, Or Name of file that contains the request");
         System.out.println("  <output>   = Filename of Response in DER encoding");
         System.out.println("  <times>    = Submit Request Multiple Times");
         System.out.println("  [<uri>]    = OCSP Service URI (i.e. /ocsp/ee/ocsp)");
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
index bb7f57e3..e48f4cbe 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
@@ -66,8 +66,8 @@ import com.netscape.cmsutil.util.HMACDigest;
 public class PKCS10Client {
 
     private static void printUsage() {
-        System.out
-                .println("Usage: PKCS10Client -p <certdb password> -d <location of certdb> -o <output file which saves the base64 PKCS10> -s <subjectDN>\n");
+        System.out.println(
+                "Usage: PKCS10Client -p <certdb password> -d <location of certdb> -o <output file which saves the base64 PKCS10> -s <subjectDN>\n");
     }
 
     public static void main(String args[]) {
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java b/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
index de83621b..e9877fd8 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PKCS12Export.java
@@ -70,12 +70,12 @@ public class PKCS12Export {
     }
 
     private static void printUsage() {
-        System.out
-                .println("Usage: PKCS12Export -d <cert/key db directory> -p <file containing password for keydb> -w <file containing pkcs12 password> -o <output file for pkcs12>");
+        System.out.println(
+                "Usage: PKCS12Export -d <cert/key db directory> -p <file containing password for keydb> -w <file containing pkcs12 password> -o <output file for pkcs12>");
         System.out.println("");
         System.out.println("If you want to turn on debug, do the following:");
-        System.out
-                .println("Usage: PKCS12Export -debug -d <cert/key db directory> -p <file containing password for keydb> -w <file containing pkcs12 password> -o <output file for pkcs12>");
+        System.out.println(
+                "Usage: PKCS12Export -debug -d <cert/key db directory> -p <file containing password for keydb> -w <file containing pkcs12 password> -o <output file for pkcs12>");
     }
 
     private static byte[] getEncodedKey(org.mozilla.jss.crypto.PrivateKey pkey) {
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index 984ac626..3bcdf1ac 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
@@ -62,16 +62,16 @@ public class PasswordCache {
     private static final String KEYDB = "key3.db";
 
     private static void usage() {
-        System.out
-                .println("This tool has to be run from the same directory where pwcache.db file resides, normally <cms instance>/config directory, unless the file's full path is specified in the -c option..\nUsage: PasswordCache <SSO_PASSWORD> <-d cert/key db directory> <-h tokenName> <-P cert/key db prefix> <-c pwcache.db_file_full_path> <-k file containing Base64EncodedKeyID> <COMMAND> ...");
+        System.out.println(
+                "This tool has to be run from the same directory where pwcache.db file resides, normally <cms instance>/config directory, unless the file's full path is specified in the -c option..\nUsage: PasswordCache <SSO_PASSWORD> <-d cert/key db directory> <-h tokenName> <-P cert/key db prefix> <-c pwcache.db_file_full_path> <-k file containing Base64EncodedKeyID> <COMMAND> ...");
         System.out.println("  commands:");
         System.out.println("     'add <password_name> <password>'");
         System.out.println("     'change <password_name> <password>'");
         System.out.println("     'delete <password_name>'");
         System.out.println("     'rekey'");
         System.out.println("     'list'");
-        System.out
-                .println("\nExample:\n\tPasswordCache thePassword1 -d /usr/netscape/servers/cms/alias -P cert-instance1-machine1- -c pwcache.db -k keyidFile list");
+        System.out.println(
+                "\nExample:\n\tPasswordCache thePassword1 -d /usr/netscape/servers/cms/alias -P cert-instance1-machine1- -c pwcache.db -k keyidFile list");
         System.exit(1);
     }
 
diff --git a/pki/base/migrate/80/MigrateSecurityDomain.java b/pki/base/migrate/80/MigrateSecurityDomain.java
index 9c12bd9c..f0f93aac 100644
--- a/pki/base/migrate/80/MigrateSecurityDomain.java
+++ b/pki/base/migrate/80/MigrateSecurityDomain.java
@@ -69,8 +69,8 @@ public class MigrateSecurityDomain {
             System.out.println("MigrateSecurityDomain getLDAPConn: creating secure (SSL) connection for internal ldap");
             conn = new LDAPConnection(new LdapJssSSLSocketFactory());
         } else {
-            System.out
-                    .println("MigrateSecurityDomain getLDAPConn: creating non-secure (non-SSL) connection for internal ldap");
+            System.out.println(
+                    "MigrateSecurityDomain getLDAPConn: creating non-secure (non-SSL) connection for internal ldap");
             conn = new LDAPConnection();
         }
 
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java
index 5a9b0b1a..1597a5fb 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java
@@ -685,8 +685,8 @@ public class ConfigureCA {
                         in.close();
                         return true;
                     } catch (Exception e) {
-                        System.out
-                                .println("CertSubjectPanel: Unable to read in external approved CA cert or certificate chain.");
+                        System.out.println(
+                               "CertSubjectPanel: Unable to read in external approved CA cert or certificate chain.");
                         System.out.println(e.toString());
                         return false;
                     }
@@ -1247,8 +1247,8 @@ public class ConfigureCA {
             } else {
                 // first pass - cacert file not defined
                 System.out.println("A Certificate Request has been generated and stored in " + ext_csr_file);
-                System.out
-                        .println("Please submit this CSR to your external CA and obtain the CA Cert and CA Cert Chain");
+                System.out.println(
+                       "Please submit this CSR to your external CA and obtain the CA Cert and CA Cert Chain");
                 return true;
             }
         }