From 86613f190ebb7a218b8bf5a8f4dbf3e52688ec92 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 20 Jul 2023 15:01:34 -0500
Subject: [PATCH] Update KRAAdminServlet to use @WebServlet

---
 base/kra/shared/webapps/kra/WEB-INF/web.xml      | 14 --------------
 .../cms/servlet/admin/KRAAdminServlet.java       | 16 +++++++++++-----
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
index 1a1dc252a34..0c630c017b5 100644
--- a/base/kra/shared/webapps/kra/WEB-INF/web.xml
+++ b/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -183,15 +183,6 @@
    </servlet>
 -->
 
-   <servlet>
-      <servlet-name>  krakra  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.admin.KRAAdminServlet  </servlet-class>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> krakra      </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  kralog  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.admin.LogAdminServlet  </servlet-class>
@@ -346,11 +337,6 @@
                          <param-value> admin          </param-value> </init-param>
    </servlet>
 
-   <servlet-mapping>
-      <servlet-name>  krakra  </servlet-name>
-      <url-pattern>   /kra  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  kralog  </servlet-name>
       <url-pattern>   /log  </url-pattern>
diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java
index 6876f4a0ad6..65f1a52520f 100644
--- a/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java
+++ b/base/kra/src/main/java/com/netscape/cms/servlet/admin/KRAAdminServlet.java
@@ -22,6 +22,8 @@
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -43,13 +45,17 @@
  * Recovery Authority. This servlet is responsible to serve
  * KRA administrative operation such as configuration
  * parameter updates.
- *
- * @version $Revision$, $Date$
  */
+@WebServlet(
+        name = "krakra",
+        urlPatterns = "/kra",
+        initParams = {
+                @WebInitParam(name="ID",       value="krakra"),
+                @WebInitParam(name="AuthzMgr", value="BasicAclAuthz")
+        }
+)
 public class KRAAdminServlet extends AdminServlet {
-    /**
-     *
-     */
+
     private static final long serialVersionUID = -5794220348195666729L;
 
     protected static final String PROP_ENABLED = "enabled";