1 files changed, 4 insertions, 64 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java
index fd3be8044..91d5f8210 100644
--- a/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java
+++ b/base/common/src/com/netscape/cms/servlet/request/model/KeyRequestInfo.java
@@ -19,84 +19,24 @@
 package com.netscape.cms.servlet.request.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 com.netscape.certsrv.dbs.keydb.KeyId;
-import com.netscape.certsrv.request.RequestId;
 
-@XmlRootElement(name="SecurityDataRequestInfo")
+@XmlRootElement(name = "SecurityDataRequestInfo")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class KeyRequestInfo {
-
-    @XmlElement
-    protected String requestType;
-
-    @XmlElement
-    protected String requestStatus;
-
-    @XmlElement
-    protected String requestURL;
+public class KeyRequestInfo extends CMSRequestInfo {
 
     @XmlElement
     protected String keyURL;
 
-    public KeyRequestInfo(){
+    public KeyRequestInfo() {
         // required to be here for JAXB (defaults)
     }
 
     /**
-     * @return the requestType
-     */
-    public String getRequestType() {
-        return requestType;
-    }
-
-    /**
-     * @param requestType the requestType to set
-     */
-    public void setRequestType(String requestType) {
-        this.requestType = requestType;
-    }
-
-    /**
-     * @return the requestStatus
-     */
-    public String getRequestStatus() {
-        return requestStatus;
-    }
-
-    /**
-     * @param requestStatus the requestStatus to set
-     */
-    public void setRequestStatus(String requestStatus) {
-        this.requestStatus = requestStatus;
-    }
-
-    /**
-     * @return the requestURL
-     */
-    public String getRequestURL() {
-        return requestURL;
-    }
-
-    /**
-     * @return the request ID in the requestURL
-     */
-    public RequestId getRequestId() {
-        String id = requestURL.substring(requestURL.lastIndexOf("/") + 1);
-        return new RequestId(id);
-    }
-
-    /**
-     * @param requestURL the requestURL to set
-     */
-    public void setRequestURL(String requestURL) {
-        this.requestURL = requestURL;
-    }
-
-    /**
      * @return the keyURL
      */
     public String getKeyURL() {