From 77c6fe55d765724df046a542dd5b3fd90a47e191 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 12 Sep 2023 09:47:40 -0500
Subject: [PATCH] Update OCSPTokenAuthenticate to use @WebServlet

---
 base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml  | 18 ------------------
 .../servlet/csadmin/OCSPTokenAuthenticate.java | 13 +++++++++++++
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
index 96047b86156..9f995ae2c5f 100644
--- a/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
+++ b/base/ocsp/shared/webapps/ocsp/WEB-INF/web.xml
@@ -7,19 +7,6 @@
 
     <display-name>Online Certificate Status Protocol Manager</display-name>
 
-   <servlet>
-      <servlet-name>  ocspTokenAuthenticate  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.OCSPTokenAuthenticate  </servlet-class>
-             <init-param><param-name>  GetClientCert  </param-name>
-                         <param-value> false       </param-value> </init-param>
-             <init-param><param-name>  authority   </param-name>
-                         <param-value> ocsp        </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> ocspTokenAuthenticate  </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> ee          </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  ocspTokenAuthenticate-admin  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.OCSPTokenAuthenticateAdmin  </servlet-class>
@@ -33,11 +20,6 @@
                          <param-value> admin          </param-value> </init-param>
    </servlet>
 
-   <servlet-mapping>
-      <servlet-name>  ocspTokenAuthenticate </servlet-name>
-      <url-pattern>   /ee/ocsp/tokenAuthenticate  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  ocspTokenAuthenticate-admin </servlet-name>
       <url-pattern>   /admin/ocsp/tokenAuthenticate  </url-pattern>
diff --git a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticate.java b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticate.java
index eaa91ef9008..9faa0809aa2 100644
--- a/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticate.java
+++ b/base/ocsp/src/main/java/com/netscape/cms/servlet/csadmin/OCSPTokenAuthenticate.java
@@ -17,6 +17,19 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "ocspTokenAuthenticate",
+        urlPatterns = "/ee/ocsp/tokenAuthenticate",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authority",     value="ocsp"),
+                @WebInitParam(name="ID",            value="ocspTokenAuthenticate"),
+                @WebInitParam(name="interface",     value="ee")
+        }
+)
 public class OCSPTokenAuthenticate extends TokenAuthenticate {
     private static final long serialVersionUID = 1L;
 }