diff options
author | Endi S. Dewata <edewata@redhat.com> | 2013-10-11 11:42:31 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2013-10-25 17:18:33 -0400 |
commit | 533029c934843c75d1a01561d3200cc41292aeda (patch) | |
tree | 6ea4b6cd5c6e8c9ffe4b7dda6c8df225e3d9def7 /base/java-tools/src/com/netscape/cmstools/cert | |
parent | 2119f1b218e9d68b13496e7042785d9c68753966 (diff) | |
download | pki-533029c934843c75d1a01561d3200cc41292aeda.tar.gz pki-533029c934843c75d1a01561d3200cc41292aeda.tar.xz pki-533029c934843c75d1a01561d3200cc41292aeda.zip |
Cleaned up CertEnrollmentRequest.
The CertEnrollmentRequest, ProfileInput, ProfileAttribute, and Descriptor
have been cleaned up to fix some bugs and minor formatting issues.
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools/cert')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java | 28 |
1 files changed, 15 insertions, 13 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(); } } |