Update KRAAdminUpdateDomainXML to use @WebServlet

dogtagpki · Jul 24, 2023 · 8fe8c27 · 8fe8c27
1 parent ca35c41
commit 8fe8c27
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/base/kra/shared/webapps/kra/WEB-INF/web.xml b/base/kra/shared/webapps/kra/WEB-INF/web.xml
@@ -126,25 +126,6 @@
    </servlet>
 -->
 
-   <servlet>
-      <servlet-name>  kraUpdateDomainXML-admin  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.KRAAdminUpdateDomainXML  </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> kra         </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> kraUpdateDomainXML </param-value> </init-param>
-             <init-param><param-name>  interface   </param-name>
-                         <param-value> admin          </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> TokenAuth </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.securitydomain.domainxml </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  kraGetCookie  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.GetCookie  </servlet-class>
@@ -227,11 +208,6 @@
       <url-pattern>   /agent/kra/grantRecovery.html  </url-pattern>
    </servlet-mapping>
 
-   <servlet-mapping>
-      <servlet-name>  kraUpdateDomainXML-admin </servlet-name>
-      <url-pattern>   /admin/kra/updateDomainXML  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  kraGetCookie </servlet-name>
       <url-pattern>   /admin/kra/getCookie  </url-pattern>

diff --git a/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java b/base/kra/src/main/java/com/netscape/cms/servlet/csadmin/KRAAdminUpdateDomainXML.java
@@ -17,6 +17,22 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "kraUpdateDomainXML-admin",
+        urlPatterns = "/admin/kra/updateDomainXML",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authority",     value="kra"),
+                @WebInitParam(name="ID",            value="kraUpdateDomainXML"),
+                @WebInitParam(name="interface",     value="admin"),
+                @WebInitParam(name="AuthMgr",       value="TokenAuth"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="resourceID",    value="certServer.securitydomain.domainxml")
+        }
+)
 public class KRAAdminUpdateDomainXML extends UpdateDomainXML {
     private static final long serialVersionUID = 1L;
 }