1 files changed, 83 insertions, 1 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java
index 30623ce6..cb6ed937 100644
--- a/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java
+++ b/base/common/src/com/netscape/cms/servlet/cert/model/CertificateData.java
@@ -18,9 +18,13 @@
 package com.netscape.cms.servlet.cert.model;
 
 import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import com.netscape.certsrv.dbs.certdb.CertId;
+import com.netscape.certsrv.dbs.certdb.CertIdAdapter;
 
 /**
  * @author alee
@@ -32,6 +36,28 @@ public class CertificateData {
     @XmlElement
     private String b64;
 
+    @XmlElement
+    private String prettyPrint;
+
+    @XmlElement
+    private String subjectName;
+
+    @XmlElement
+    private String pkcs7CertChain;
+
+    @XmlElement
+    @XmlJavaTypeAdapter(CertIdAdapter.class)
+    private CertId serialNo;
+
+    @XmlElement
+    private String notBefore;
+
+    @XmlElement
+    private String notAfter;
+
+    @XmlElement
+    private String issuerName;
+
     public CertificateData() {
         // required for jaxb
     }
@@ -50,4 +76,60 @@ public class CertificateData {
         this.b64 = b64;
     }
 
+    public String getPrettyPrint() {
+        return prettyPrint;
+    }
+
+    public void setPrettyPrint(String prettyPrint) {
+        this.prettyPrint = prettyPrint;
+    }
+
+    public void setPkcs7CertChain(String chain) {
+        this.pkcs7CertChain = chain;
+    }
+
+    public String getPkcs7CertChain() {
+        return pkcs7CertChain;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public CertId getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(CertId serialNo) {
+        this.serialNo = serialNo;
+    }
+
+    public String getNotBefore() {
+        return notBefore;
+    }
+
+    public void setNotBefore(String notBefore) {
+        this.notBefore = notBefore;
+    }
+
+    public String getNotAfter() {
+        return notAfter;
+    }
+
+    public void setNotAfter(String notAfter) {
+        this.notAfter = notAfter;
+    }
+
+    public String getIssuerName() {
+        return issuerName;
+    }
+
+    public void setIssuerName(String issuerName) {
+        this.issuerName = issuerName;
+    }
+
 }