Update TPSGetConfigEntries to use @WebServlet

dogtagpki · Sep 14, 2023 · a3088c2 · a3088c2
1 parent 171523d
commit a3088c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/base/tks/shared/webapps/tks/WEB-INF/web.xml b/base/tks/shared/webapps/tks/WEB-INF/web.xml
@@ -7,23 +7,6 @@
 
     <display-name>Token Key Service</display-name>
 
-   <servlet>
-      <servlet-name>  tksGetConfigEntries  </servlet-name>
-      <servlet-class> com.netscape.cms.servlet.csadmin.TPSGetConfigEntries </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> tks          </param-value> </init-param>
-             <init-param><param-name>  ID          </param-name>
-                         <param-value> tksGetConfigEntries </param-value> </init-param>
-             <init-param><param-name>  AuthzMgr    </param-name>
-                         <param-value> BasicAclAuthz </param-value> </init-param>
-             <init-param><param-name>  AuthMgr     </param-name>
-                         <param-value> TokenAuth </param-value> </init-param>
-             <init-param><param-name>  resourceID  </param-name>
-                         <param-value> certServer.clone.configuration.GetConfigEntries </param-value> </init-param>
-   </servlet>
-
    <servlet>
       <servlet-name>  tksGetStatus  </servlet-name>
       <servlet-class> com.netscape.cms.servlet.csadmin.TKSGetStatus  </servlet-class>
@@ -35,11 +18,6 @@
                          <param-value> tksGetStatus </param-value> </init-param>
    </servlet>
 
-   <servlet-mapping>
-      <servlet-name>  tksGetConfigEntries  </servlet-name>
-      <url-pattern>   /admin/tks/getConfigEntries  </url-pattern>
-   </servlet-mapping>
-
    <servlet-mapping>
       <servlet-name>  tksGetStatus  </servlet-name>
       <url-pattern>   /admin/tks/getStatus  </url-pattern>

diff --git a/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetConfigEntries.java b/base/tks/src/main/java/com/netscape/cms/servlet/csadmin/TPSGetConfigEntries.java
@@ -17,6 +17,21 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.servlet.csadmin;
 
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
+
+@WebServlet(
+        name = "tksGetConfigEntries",
+        urlPatterns = "/admin/tks/getConfigEntries",
+        initParams = {
+                @WebInitParam(name="GetClientCert", value="false"),
+                @WebInitParam(name="authority",     value="tks"),
+                @WebInitParam(name="ID",            value="tksGetConfigEntries"),
+                @WebInitParam(name="AuthzMgr",      value="BasicAclAuthz"),
+                @WebInitParam(name="AuthMgr",       value="TokenAuth"),
+                @WebInitParam(name="resourceID",    value="certServer.clone.configuration.GetConfigEntries")
+        }
+)
 public class TPSGetConfigEntries extends GetConfigEntries {
     private static final long serialVersionUID = 1L;
 }