From 9f4e43d475f60f1d0e2a3c8f56c570391805ecdc Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Tue, 26 Nov 2024 14:05:22 +0530
Subject: [PATCH] modify web.xml in recovery and user endpoints

---
 .../src/main/webapp/WEB-INF/web.xml           | 40 +++++++++++++------
 .../src/main/webapp/WEB-INF/web.xml           | 38 ++++++++++++------
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml b/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml
index b59b40c6b2..2aa9c6350d 100644
--- a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml
+++ b/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,6 @@
     <display-name>WSO2 Identity Server Recovery REST API</display-name>
     <description>WSO2 Identity Server Recovery REST API</description>
 
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/beans.xml</param-value>
-    </context-param>
-
     <filter>
         <filter-name>CaptchaFilter</filter-name>
         <filter-class>org.wso2.carbon.identity.captcha.filter.CaptchaFilter</filter-class>
@@ -63,18 +58,39 @@
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
 
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
     <servlet>
         <servlet-name>CXFServlet</servlet-name>
         <servlet-class>
-            org.apache.cxf.transport.servlet.CXFServlet
+            org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
         </servlet-class>
         <load-on-startup>1</load-on-startup>
+
+        <init-param>
+            <param-name>jaxrs.serviceClasses</param-name>
+            <param-value>
+                org.wso2.carbon.identity.recovery.endpoint.ClaimsApi,
+                org.wso2.carbon.identity.recovery.endpoint.RecoverPasswordApi,
+                org.wso2.carbon.identity.recovery.endpoint.RecoverUsernameApi,
+                org.wso2.carbon.identity.recovery.endpoint.SecurityQuestionApi,
+                org.wso2.carbon.identity.recovery.endpoint.SecurityQuestionsApi,
+                org.wso2.carbon.identity.recovery.endpoint.SetPasswordApi,
+                org.wso2.carbon.identity.recovery.endpoint.ValidateAnswerApi,
+                org.wso2.carbon.identity.recovery.endpoint.ValidateCodeApi,
+                org.wso2.carbon.identity.recovery.endpoint.CaptchaApi
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jaxrs.address</param-name>
+            <param-value>/</param-value>
+        </init-param>
+        <init-param>
+            <param-name>jaxrs.providers</param-name>
+            <param-value>
+                com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider,
+                org.wso2.carbon.identity.recovery.endpoint.filter.ResponseValidationFilter,
+                org.wso2.carbon.identity.recovery.endpoint.Exceptions.RecoveryEndpointExceptionMapper
+            </param-value>
+        </init-param>
     </servlet>
 
     <servlet-mapping>
diff --git a/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml b/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml
index 4b03219e0a..be8613840e 100644
--- a/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml
+++ b/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,6 @@
     <display-name>WSO2 Identity Server User REST API</display-name>
     <description>WSO2 Identity Server User REST API</description>
 
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/beans.xml</param-value>
-    </context-param>
-
     <filter>
         <filter-name>CaptchaFilter</filter-name>
         <filter-class>org.wso2.carbon.identity.captcha.filter.CaptchaFilter</filter-class>
@@ -63,18 +58,37 @@
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
 
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
     <servlet>
         <servlet-name>CXFServlet</servlet-name>
         <servlet-class>
-            org.apache.cxf.transport.servlet.CXFServlet
+            org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
         </servlet-class>
         <load-on-startup>1</load-on-startup>
+
+        <init-param>
+            <param-name>jaxrs.serviceClasses</param-name>
+            <param-value>
+                org.wso2.carbon.identity.user.endpoint.IntrospectCodeApi,
+                org.wso2.carbon.identity.user.endpoint.LiteApi,
+                org.wso2.carbon.identity.user.endpoint.MeApi,
+                org.wso2.carbon.identity.user.endpoint.PiInfoApi,
+                org.wso2.carbon.identity.user.endpoint.ResendCodeApi,
+                org.wso2.carbon.identity.user.endpoint.UpdateUsernameApi,
+                org.wso2.carbon.identity.user.endpoint.ValidateCodeApi,
+                org.wso2.carbon.identity.user.endpoint.ValidateUsernameApi
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jaxrs.address</param-name>
+            <param-value>/</param-value>
+        </init-param>
+        <init-param>
+            <param-name>jaxrs.providers</param-name>
+            <param-value>
+                com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider,
+                org.wso2.carbon.identity.user.endpoint.exceptions.UserEndpointExceptionMapper
+            </param-value>
+        </init-param>
     </servlet>
 
     <servlet-mapping>