Cleaned up REST common class names.

The REST common classes have been renamed for better clarity
and consistency.

Ticket #259

1 files changed, 6 insertions, 6 deletions

diff --git a/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java b/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java
index e09f8be5b..021400f75 100644
--- a/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java
+++ b/base/common/src/com/netscape/cms/client/cert/CertRequestSubmitCLI.java
@@ -15,7 +15,7 @@ import com.netscape.cms.client.cli.CLI;
 import com.netscape.cms.client.cli.MainCLI;
 import com.netscape.cms.servlet.request.model.CertRequestInfo;
 import com.netscape.cms.servlet.request.model.CertRequestInfos;
-import com.netscape.cms.servlet.request.model.EnrollmentRequestData;
+import com.netscape.cms.servlet.request.model.CertEnrollmentRequest;
 
 public class CertRequestSubmitCLI extends CLI {
 
@@ -46,7 +46,7 @@ public class CertRequestSubmitCLI extends CLI {
             System.exit(-1);
         }
 
-        EnrollmentRequestData erd = null;
+        CertEnrollmentRequest erd = null;
 
         try {
             erd = getEnrollmentRequest(cLineArgs[0]);
@@ -62,12 +62,12 @@ public class CertRequestSubmitCLI extends CLI {
         }
     }
 
-    private EnrollmentRequestData getEnrollmentRequest(String fileName) throws JAXBException, FileNotFoundException {
-        EnrollmentRequestData erd = null;
-        JAXBContext context = JAXBContext.newInstance(EnrollmentRequestData.class);
+    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 = (EnrollmentRequestData) unmarshaller.unmarshal(fis);
+        erd = (CertEnrollmentRequest) unmarshaller.unmarshal(fis);
         return erd;
     }