Formatting - fix bad wrapsayoung-ticket-2

Fixed conflicts in:

	pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java
	pki/base/common/src/com/netscape/cms/logging/LogFile.java
	pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java
	pki/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java
	pki/base/common/src/com/netscape/cms/profile/common/EnrollProfile.java
	pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
	pki/base/common/src/com/netscape/cms/servlet/cert/DoRevoke.java
	pki/base/common/src/com/netscape/cms/servlet/request/CertReqParser.java
	pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java

6 files changed, 16 insertions, 16 deletions

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 2cf20b9f..0c91d220 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
@@ -96,8 +96,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 084235c1..860893a3 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 326de76d..5c7722c5 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
@@ -64,8 +64,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 d6273f17..ae0af3d4 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);
     }