2 files changed, 18 insertions, 16 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
index 917a697b6..d43763f11 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
@@ -1,12 +1,11 @@
 package com.netscape.cmstools.cert;
 
-import java.io.FileInputStream;
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Collection;
+import java.util.Scanner;
 
-import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
@@ -50,16 +49,16 @@ public class CertRequestSubmitCLI extends CLI {
             System.exit(-1);
         }
 
-        CertEnrollmentRequest erd = null;
-
         try {
-            erd = getEnrollmentRequest(cLineArgs[0]);
+            CertEnrollmentRequest erd = getEnrollmentRequest(cLineArgs[0]);
             CertRequestInfos cri = certCLI.certClient.enrollRequest(erd);
             MainCLI.printMessage("Submitted certificate request");
             printRequestInformation(cri);
+
         } catch (FileNotFoundException e) {
             System.err.println("Error: " + e.getMessage());
             System.exit(-1);
+
         } catch (JAXBException e) {
             System.err.println("Error: " + e.getMessage());
             System.exit(-1);
@@ -67,19 +66,22 @@ public class CertRequestSubmitCLI extends CLI {
     }
 
     private CertEnrollmentRequest getEnrollmentRequest(String fileName) throws JAXBException, FileNotFoundException {
-        CertEnrollmentRequest erd = null;
-        JAXBContext context = JAXBContext.newInstance(CertEnrollmentRequest.class);
-        Unmarshaller unmarshaller = context.createUnmarshaller();
-        FileInputStream fis = new FileInputStream(fileName);
-        erd = (CertEnrollmentRequest) unmarshaller.unmarshal(fis);
-        return erd;
+        try (Scanner scanner = new Scanner(new File(fileName))) {
+            String xml = scanner.useDelimiter("\\A").next();
+            return CertEnrollmentRequest.fromXML(xml);
+        }
     }
 
     private void printRequestInformation(CertRequestInfos cri) {
         Collection<CertRequestInfo> allRequests = cri.getRequests();
+        boolean first = true;
         for (CertRequestInfo x : allRequests) {
+            if (first) {
+                first = false;
+            } else {
+                System.out.println();
+            }
             CertCLI.printCertRequestInfo(x);
         }
-        System.out.println();
     }
 }
diff --git a/base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java b/base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java
index 775398283..732b597af 100644
--- a/base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/profile/ProfileCLI.java
@@ -82,7 +82,7 @@ public class ProfileCLI extends CLI {
             System.out.println("  Input ID: " + input.getId());
             System.out.println("  Name: " + input.getName());
             System.out.println("  Class: " + input.getClassId());
-            for (ProfileAttribute attr: input.getAttrs()) {
+            for (ProfileAttribute attr : input.getAttributes()) {
                 System.out.println();
                 System.out.println("    Attribute Name: " + attr.getName());
                 System.out.println("    Attribute Description: " +
@@ -144,14 +144,14 @@ public class ProfileCLI extends CLI {
 
     public static void printEnrollmentTemplate(CertEnrollmentRequest request) {
         System.out.println("  Profile ID: " +  request.getProfileId());
-        System.out.println("  Renewal: " + request.getIsRenewal());
+        System.out.println("  Renewal: " + request.isRenewal());
 
         for (ProfileInput input: request.getInputs()) {
             System.out.println();
             System.out.println("  Input ID: " + input.getId());
             System.out.println("  Name: " + input.getName());
             System.out.println("  Class: " + input.getClassId());
-            for (ProfileAttribute attr: input.getAttrs()) {
+            for (ProfileAttribute attr : input.getAttributes()) {
                 System.out.println();
                 System.out.println("    Attribute Name: " + attr.getName());
                 System.out.println("    Attribute Description: " +