Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

5 files changed, 174 insertions, 142 deletions

diff --git a/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
index 66d34c6e2..999bdc67e 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
+++ b/pki/base/common/src/com/netscape/cms/profile/output/CMMFOutput.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.output;
 
+
 import java.io.ByteArrayOutputStream;
 import java.security.cert.X509Certificate;
 import java.util.Locale;
@@ -44,13 +45,14 @@ import com.netscape.certsrv.property.IDescriptor;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.cms.profile.common.EnrollProfile;
 
+
 /**
- * This class implements the output plugin that outputs CMMF response for the
- * issued certificate.
- * 
+ * This class implements the output plugin that outputs
+ * CMMF response for the issued certificate.
+ *
  * @version $Revision$, $Date$
  */
-public class CMMFOutput extends EnrollOutput implements IProfileOutput {
+public class CMMFOutput extends EnrollOutput implements IProfileOutput { 
 
     public static final String VAL_PRETTY_CERT = "pretty_cert";
     public static final String VAL_CMMF_RESPONSE = "cmmf_response";
@@ -64,7 +66,7 @@ public class CMMFOutput extends EnrollOutput implements IProfileOutput {
      * Initializes this default policy.
      */
     public void init(IProfile profile, IConfigStore config)
-            throws EProfileException {
+        throws EProfileException {
         super.init(profile, config);
     }
 
@@ -86,66 +88,72 @@ public class CMMFOutput extends EnrollOutput implements IProfileOutput {
      * Populates the request with this policy default.
      */
     public void populate(IProfileContext ctx, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
     }
 
     /**
-     * Retrieves the descriptor of the given value parameter by name.
+     * Retrieves the descriptor of the given value
+     * parameter by name.
      */
     public IDescriptor getValueDescriptor(Locale locale, String name) {
         if (name.equals(VAL_PRETTY_CERT)) {
-            return new Descriptor(IDescriptor.PRETTY_PRINT, null, null,
-                    CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_CERT_PP"));
+            return new Descriptor(IDescriptor.PRETTY_PRINT, null,
+                    null,
+                    CMS.getUserMessage(locale, 
+                        "CMS_PROFILE_OUTPUT_CERT_PP"));
         } else if (name.equals(VAL_CMMF_RESPONSE)) {
-            return new Descriptor(IDescriptor.PRETTY_PRINT, null, null,
-                    CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_CMMF_B64"));
+            return new Descriptor(IDescriptor.PRETTY_PRINT, null,
+                    null,
+                    CMS.getUserMessage(locale, 
+                        "CMS_PROFILE_OUTPUT_CMMF_B64"));
         }
         return null;
     }
 
     public String getValue(String name, Locale locale, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
         if (name.equals(VAL_PRETTY_CERT)) {
-            X509CertImpl cert = request
-                    .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
-            ICertPrettyPrint prettyCert = CMS.getCertPrettyPrint(cert);
+            X509CertImpl cert = request.getExtDataInCert(
+                    EnrollProfile.REQUEST_ISSUED_CERT);
+            ICertPrettyPrint prettyCert = CMS.getCertPrettyPrint(cert); 
 
             return prettyCert.toString(locale);
         } else if (name.equals(VAL_CMMF_RESPONSE)) {
             try {
-                X509CertImpl cert = request
-                        .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
-                if (cert == null)
-                    return null;
-
-                ICertificateAuthority ca = (ICertificateAuthority) CMS
-                        .getSubsystem("ca");
-                CertificateChain cachain = ca.getCACertChain();
-                X509Certificate[] cacerts = cachain.getChain();
-
-                byte[][] caPubs = new byte[cacerts.length][];
-
-                for (int j = 0; j < cacerts.length; j++) {
-                    caPubs[j] = ((X509CertImpl) cacerts[j]).getEncoded();
-                }
-
-                CertRepContent certRepContent = null;
-                certRepContent = new CertRepContent(caPubs);
-
-                PKIStatusInfo status = new PKIStatusInfo(PKIStatusInfo.granted);
-                CertifiedKeyPair certifiedKP = new CertifiedKeyPair(
-                        new CertOrEncCert(cert.getEncoded()));
-                CertResponse resp = new CertResponse(new INTEGER(request
-                        .getRequestId().toString()), status, certifiedKP);
-                certRepContent.addCertResponse(resp);
-
-                ByteArrayOutputStream certRepOut = new ByteArrayOutputStream();
-                certRepContent.encode(certRepOut);
-                byte[] certRepBytes = certRepOut.toByteArray();
-
-                return CMS.BtoA(certRepBytes);
+              X509CertImpl cert = request.getExtDataInCert(
+                    EnrollProfile.REQUEST_ISSUED_CERT);
+              if (cert == null)
+                  return null;
+            
+              ICertificateAuthority ca = (ICertificateAuthority)
+                   CMS.getSubsystem("ca");
+              CertificateChain cachain = ca.getCACertChain(); 
+              X509Certificate[] cacerts = cachain.getChain();
+
+              byte[][] caPubs = new byte[cacerts.length][];
+
+              for (int j = 0; j < cacerts.length; j++)  {
+                caPubs[j] = ((X509CertImpl) cacerts[j]).getEncoded();
+              }   
+
+              CertRepContent certRepContent = null;
+              certRepContent = new CertRepContent(caPubs);
+
+              PKIStatusInfo status = new PKIStatusInfo(PKIStatusInfo.granted); 
+              CertifiedKeyPair certifiedKP = 
+                new CertifiedKeyPair(new CertOrEncCert(cert.getEncoded())); 
+              CertResponse resp = 
+                new CertResponse(new INTEGER(request.getRequestId().toString()), 
+                 status, certifiedKP);
+              certRepContent.addCertResponse(resp);
+
+              ByteArrayOutputStream certRepOut = new ByteArrayOutputStream(); 
+              certRepContent.encode(certRepOut); 
+              byte[] certRepBytes = certRepOut.toByteArray();
+
+              return CMS.BtoA(certRepBytes); 
             } catch (Exception e) {
-                return null;
+               return null;
             }
         } else {
             return null;
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java
index ae71532d0..7a2631da4 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java
+++ b/pki/base/common/src/com/netscape/cms/profile/output/CertOutput.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.output;
 
+
 import java.util.Locale;
 
 import netscape.security.x509.X509CertImpl;
@@ -33,13 +34,14 @@ import com.netscape.certsrv.property.IDescriptor;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.cms.profile.common.EnrollProfile;
 
+
 /**
- * This class implements the pretty print certificate output that displays the
- * issued certificate in a pretty print format.
- * 
+ * This class implements the pretty print certificate output
+ * that displays the issued certificate in a pretty print format.
+ *
  * @version $Revision$, $Date$
  */
-public class CertOutput extends EnrollOutput implements IProfileOutput {
+public class CertOutput extends EnrollOutput implements IProfileOutput { 
     public static final String VAL_PRETTY_CERT = "pretty_cert";
     public static final String VAL_B64_CERT = "b64_cert";
 
@@ -52,7 +54,7 @@ public class CertOutput extends EnrollOutput implements IProfileOutput {
      * Initializes this default policy.
      */
     public void init(IProfile profile, IConfigStore config)
-            throws EProfileException {
+        throws EProfileException {
         super.init(profile, config);
     }
 
@@ -74,39 +76,44 @@ public class CertOutput extends EnrollOutput implements IProfileOutput {
      * Populates the request with this policy default.
      */
     public void populate(IProfileContext ctx, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
     }
 
     /**
-     * Retrieves the descriptor of the given value parameter by name.
+     * Retrieves the descriptor of the given value
+     * parameter by name.
      */
     public IDescriptor getValueDescriptor(Locale locale, String name) {
         if (name.equals(VAL_PRETTY_CERT)) {
-            return new Descriptor(IDescriptor.PRETTY_PRINT, null, null,
-                    CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_CERT_PP"));
+            return new Descriptor(IDescriptor.PRETTY_PRINT, null,
+                    null,
+                    CMS.getUserMessage(locale, 
+                        "CMS_PROFILE_OUTPUT_CERT_PP"));
         } else if (name.equals(VAL_B64_CERT)) {
-            return new Descriptor(IDescriptor.PRETTY_PRINT, null, null,
-                    CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_CERT_B64"));
+            return new Descriptor(IDescriptor.PRETTY_PRINT, null,
+                    null,
+                    CMS.getUserMessage(locale, 
+                        "CMS_PROFILE_OUTPUT_CERT_B64"));
         }
         return null;
     }
 
     public String getValue(String name, Locale locale, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
         if (name.equals(VAL_PRETTY_CERT)) {
-            X509CertImpl cert = request
-                    .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
+            X509CertImpl cert = request.getExtDataInCert(
+                    EnrollProfile.REQUEST_ISSUED_CERT);
             if (cert == null)
                 return null;
-            ICertPrettyPrint prettyCert = CMS.getCertPrettyPrint(cert);
+            ICertPrettyPrint prettyCert = CMS.getCertPrettyPrint(cert); 
 
             return prettyCert.toString(locale);
         } else if (name.equals(VAL_B64_CERT)) {
-            X509CertImpl cert = request
-                    .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
+            X509CertImpl cert = request.getExtDataInCert(
+                    EnrollProfile.REQUEST_ISSUED_CERT);
             if (cert == null)
                 return null;
-            return CMS.getEncodedCert(cert);
+            return CMS.getEncodedCert(cert); 
         } else {
             return null;
         }
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
index 64c61f437..3013e8810 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
+++ b/pki/base/common/src/com/netscape/cms/profile/output/EnrollOutput.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.output;
 
+
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Vector;
@@ -30,21 +31,22 @@ import com.netscape.certsrv.property.EPropertyException;
 import com.netscape.certsrv.property.IDescriptor;
 import com.netscape.certsrv.request.IRequest;
 
+
 /**
  * This class implements the basic enrollment output.
- * 
+ *
  * @version $Revision$, $Date$
  */
-public abstract class EnrollOutput implements IProfileOutput {
+public abstract class EnrollOutput implements IProfileOutput { 
     private IConfigStore mConfig = null;
     private Vector mValueNames = new Vector();
     protected Vector mConfigNames = new Vector();
-
+ 
     /**
      * Initializes this default policy.
      */
     public void init(IProfile profile, IConfigStore config)
-            throws EProfileException {
+        throws EProfileException {
         mConfig = config;
     }
 
@@ -58,26 +60,28 @@ public abstract class EnrollOutput implements IProfileOutput {
 
     /**
      * Populates the request with this policy default.
-     * 
+     *
      * @param ctx profile context
      * @param request request
      * @exception EProfileException failed to populate
      */
     public abstract void populate(IProfileContext ctx, IRequest request)
-            throws EProfileException;
+        throws EProfileException;
 
     /**
-     * Retrieves the descriptor of the given value parameter by name.
-     * 
+     * Retrieves the descriptor of the given value
+     * parameter by name.
+     *
      * @param locale user locale
      * @param name property name
      * @return property descriptor
      */
     public abstract IDescriptor getValueDescriptor(Locale locale, String name);
 
+
     /**
      * Retrieves the localizable name of this policy.
-     * 
+     *
      * @param locale user locale
      * @return output policy name
      */
@@ -85,7 +89,7 @@ public abstract class EnrollOutput implements IProfileOutput {
 
     /**
      * Retrieves the localizable description of this policy.
-     * 
+     *
      * @param locale user locale
      * @return output policy description
      */
@@ -99,7 +103,7 @@ public abstract class EnrollOutput implements IProfileOutput {
     }
 
     public String getValue(String name, Locale locale, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
         return request.getExtDataInString(name);
     }
 
@@ -107,7 +111,7 @@ public abstract class EnrollOutput implements IProfileOutput {
      * Sets the value of the given value parameter by name.
      */
     public void setValue(String name, Locale locale, IRequest request,
-            String value) throws EPropertyException {
+        String value) throws EPropertyException {
         request.setExtData(name, value);
     }
 
@@ -119,7 +123,8 @@ public abstract class EnrollOutput implements IProfileOutput {
         return null;
     }
 
-    public void setConfig(String name, String value) throws EPropertyException {
+    public void setConfig(String name, String value)
+        throws EPropertyException {
     }
 
     public String getConfig(String name) {
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java b/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
index 01550c1a3..657184813 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
+++ b/pki/base/common/src/com/netscape/cms/profile/output/PKCS7Output.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.output;
 
+
 import java.io.ByteArrayOutputStream;
 import java.security.cert.X509Certificate;
 import java.util.Locale;
@@ -41,13 +42,14 @@ import com.netscape.certsrv.property.IDescriptor;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.cms.profile.common.EnrollProfile;
 
+
 /**
- * This class implements the output plugin that outputs PKCS7 for the issued
- * certificate.
- * 
+ * This class implements the output plugin that outputs
+ * PKCS7 for the issued certificate.
+ *
  * @version $Revision$, $Date$
  */
-public class PKCS7Output extends EnrollOutput implements IProfileOutput {
+public class PKCS7Output extends EnrollOutput implements IProfileOutput { 
 
     public static final String VAL_PRETTY_CERT = "pretty_cert";
     public static final String VAL_PKCS7 = "pkcs7";
@@ -61,7 +63,7 @@ public class PKCS7Output extends EnrollOutput implements IProfileOutput {
      * Initializes this default policy.
      */
     public void init(IProfile profile, IConfigStore config)
-            throws EProfileException {
+        throws EProfileException {
         super.init(profile, config);
     }
 
@@ -83,65 +85,72 @@ public class PKCS7Output extends EnrollOutput implements IProfileOutput {
      * Populates the request with this policy default.
      */
     public void populate(IProfileContext ctx, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
     }
 
     /**
-     * Retrieves the descriptor of the given value parameter by name.
+     * Retrieves the descriptor of the given value
+     * parameter by name.
      */
     public IDescriptor getValueDescriptor(Locale locale, String name) {
         if (name.equals(VAL_PRETTY_CERT)) {
-            return new Descriptor(IDescriptor.PRETTY_PRINT, null, null,
-                    CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_CERT_PP"));
+            return new Descriptor(IDescriptor.PRETTY_PRINT, null,
+                    null,
+                    CMS.getUserMessage(locale, 
+                        "CMS_PROFILE_OUTPUT_CERT_PP"));
         } else if (name.equals(VAL_PKCS7)) {
-            return new Descriptor(IDescriptor.PRETTY_PRINT, null, null,
-                    CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_PKCS7_B64"));
+            return new Descriptor(IDescriptor.PRETTY_PRINT, null,
+                    null,
+                    CMS.getUserMessage(locale, 
+                        "CMS_PROFILE_OUTPUT_PKCS7_B64"));
         }
         return null;
     }
 
     public String getValue(String name, Locale locale, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
         if (name.equals(VAL_PRETTY_CERT)) {
-            X509CertImpl cert = request
-                    .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
+            X509CertImpl cert = request.getExtDataInCert(
+                    EnrollProfile.REQUEST_ISSUED_CERT);
             if (cert == null)
-                return null;
-            ICertPrettyPrint prettyCert = CMS.getCertPrettyPrint(cert);
+                  return null;
+            ICertPrettyPrint prettyCert = CMS.getCertPrettyPrint(cert); 
 
             return prettyCert.toString(locale);
         } else if (name.equals(VAL_PKCS7)) {
 
             try {
-                X509CertImpl cert = request
-                        .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
-                if (cert == null)
-                    return null;
-
-                ICertificateAuthority ca = (ICertificateAuthority) CMS
-                        .getSubsystem("ca");
-                CertificateChain cachain = ca.getCACertChain();
-                X509Certificate[] cacerts = cachain.getChain();
-
-                X509CertImpl[] userChain = new X509CertImpl[cacerts.length + 1];
-                int m = 1, n = 0;
-
-                for (; n < cacerts.length; m++, n++) {
-                    userChain[m] = (X509CertImpl) cacerts[n];
-                }
-
-                userChain[0] = cert;
-                PKCS7 p7 = new PKCS7(new AlgorithmId[0], new ContentInfo(
-                        new byte[0]), userChain, new SignerInfo[0]);
-                ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
-                p7.encodeSignedData(bos);
-                byte[] p7Bytes = bos.toByteArray();
-                String p7Str = CMS.BtoA(p7Bytes);
-
-                return p7Str;
+              X509CertImpl cert = request.getExtDataInCert(
+                    EnrollProfile.REQUEST_ISSUED_CERT);
+              if (cert == null)
+                  return null;
+            
+              ICertificateAuthority ca = (ICertificateAuthority)
+                   CMS.getSubsystem("ca");
+              CertificateChain cachain = ca.getCACertChain(); 
+              X509Certificate[] cacerts = cachain.getChain();
+
+              X509CertImpl[] userChain = new X509CertImpl[cacerts.length + 1]; 
+              int m = 1, n = 0;
+
+              for (; n < cacerts.length; m++, n++) {
+                userChain[m] = (X509CertImpl) cacerts[n];
+              }
+
+              userChain[0] = cert;
+              PKCS7 p7 = new PKCS7(new AlgorithmId[0], 
+                  new ContentInfo(new byte[0]), 
+                  userChain, 
+                  new SignerInfo[0]); 
+              ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+              p7.encodeSignedData(bos); 
+              byte[] p7Bytes = bos.toByteArray(); 
+              String p7Str = CMS.BtoA(p7Bytes);
+
+              return p7Str;
             } catch (Exception e) {
-                return "";
+              return "";
             }
         } else {
             return null;
diff --git a/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java b/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
index 31a1ddbae..90aa40a14 100644
--- a/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
+++ b/pki/base/common/src/com/netscape/cms/profile/output/nsNKeyOutput.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.output;
 
+
 import java.util.Locale;
 
 import netscape.security.x509.X509CertImpl;
@@ -32,13 +33,14 @@ import com.netscape.certsrv.property.IDescriptor;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.cms.profile.common.EnrollProfile;
 
+
 /**
- * This class implements the output plugin that outputs DER for the issued
- * certificate for token keys
- * 
+ * This class implements the output plugin that outputs
+ * DER for the issued certificate for token keys
+ *
  * @version $Revision$, $Date$
  */
-public class nsNKeyOutput extends EnrollOutput implements IProfileOutput {
+public class nsNKeyOutput extends EnrollOutput implements IProfileOutput { 
 
     public static final String VAL_DER = "der";
 
@@ -50,7 +52,7 @@ public class nsNKeyOutput extends EnrollOutput implements IProfileOutput {
      * Initializes this default policy.
      */
     public void init(IProfile profile, IConfigStore config)
-            throws EProfileException {
+        throws EProfileException {
         super.init(profile, config);
     }
 
@@ -58,48 +60,49 @@ public class nsNKeyOutput extends EnrollOutput implements IProfileOutput {
      * Retrieves the localizable name of this policy.
      */
     public String getName(Locale locale) {
-        return CMS.getUserMessage(locale,
-                "CMS_PROFILE_OUTPUT_CERT_TOKENKEY_NAME");
+        return CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_CERT_TOKENKEY_NAME");
     }
 
     /**
      * Retrieves the localizable description of this policy.
      */
     public String getText(Locale locale) {
-        return CMS.getUserMessage(locale,
-                "CMS_PROFILE_OUTPUT_CERT_TOKENKEY_TEXT");
+        return CMS.getUserMessage(locale, "CMS_PROFILE_OUTPUT_CERT_TOKENKEY_TEXT");
     }
 
     /**
      * Populates the request with this policy default.
      */
     public void populate(IProfileContext ctx, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
     }
 
     /**
-     * Retrieves the descriptor of the given value parameter by name.
+     * Retrieves the descriptor of the given value
+     * parameter by name.
      */
     public IDescriptor getValueDescriptor(Locale locale, String name) {
         if (name.equals(VAL_DER)) {
-            return new Descriptor("der_b64", null, null, CMS.getUserMessage(
-                    locale, "CMS_PROFILE_OUTPUT_DER_B64"));
+            return new Descriptor("der_b64", null,
+                    null,
+                    CMS.getUserMessage(locale, 
+                        "CMS_PROFILE_OUTPUT_DER_B64"));
         }
         return null;
     }
 
     public String getValue(String name, Locale locale, IRequest request)
-            throws EProfileException {
+        throws EProfileException {
         if (name.equals(VAL_DER)) {
 
             try {
-                X509CertImpl cert = request
-                        .getExtDataInCert(EnrollProfile.REQUEST_ISSUED_CERT);
-                if (cert == null)
-                    return null;
-                return CMS.BtoA(cert.getEncoded());
+              X509CertImpl cert = request.getExtDataInCert(
+                    EnrollProfile.REQUEST_ISSUED_CERT);
+              if (cert == null)
+                  return null;
+			  return CMS.BtoA(cert.getEncoded());
             } catch (Exception e) {
-                return "";
+              return "";
             }
         } else {
             return null;