Update TPSPhoneHome to use @WebServlet

dogtagpki · Sep 18, 2023 · 8ef4e86 · 8ef4e86
1 parent d6da2dc
commit 8ef4e86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/base/tps/shared/webapps/tps/WEB-INF/web.xml b/base/tps/shared/webapps/tps/WEB-INF/web.xml
@@ -7,21 +7,11 @@
 
     <display-name>Token Processing Service</display-name>
 
-    <servlet>
-     <servlet-name>phoneHome</servlet-name>
-     <servlet-class>org.dogtagpki.server.tps.TPSPhoneHome</servlet-class>
-    </servlet>
-
     <servlet>
         <servlet-name>tps</servlet-name>
         <servlet-class>org.dogtagpki.server.tps.TPSServlet</servlet-class>
     </servlet>
 
-    <servlet-mapping>
-        <servlet-name>phoneHome</servlet-name>
-        <url-pattern>/phoneHome</url-pattern>
-    </servlet-mapping>
-
     <servlet-mapping>
         <servlet-name>tps</servlet-name>
         <url-pattern>/tps</url-pattern>

diff --git a/base/tps/src/main/java/org/dogtagpki/server/tps/TPSPhoneHome.java b/base/tps/src/main/java/org/dogtagpki/server/tps/TPSPhoneHome.java
@@ -7,6 +7,7 @@
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -15,6 +16,10 @@
 
 import com.netscape.cmscore.apps.CMS;
 
+@WebServlet(
+        name = "phoneHome",
+        urlPatterns = "/phoneHome"
+)
 public class TPSPhoneHome extends HttpServlet {
 
     public static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TPSPhoneHome.class);