From 288a18a383dc77d1e579fa3f455150e679b63fba Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Tue, 26 Nov 2024 14:58:16 +0530
Subject: [PATCH] modify web.xml to remove spring dependency from config mgmt
 endpoint

---
 .../pom.xml                                   |  6 ---
 .../src/main/webapp/WEB-INF/beans.xml         | 50 -------------------
 .../src/main/webapp/WEB-INF/web.xml           | 31 ++++++++----
 3 files changed, 21 insertions(+), 66 deletions(-)
 delete mode 100644 components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/beans.xml

diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml
index 2828ab904a3b..fc2dd9bd6ccf 100644
--- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml
+++ b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml
@@ -99,12 +99,6 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <version>${springframework.spring-web.version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/beans.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/beans.xml
deleted file mode 100644
index b0e63071030d..000000000000
--- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~  Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
-  ~
-  ~  http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
-  -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs"
-       xmlns:context="http://www.springframework.org/schema/context" xmlns:cxf="http://cxf.apache.org/core"
-       xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
-
-    <context:property-placeholder/>
-    <context:annotation-config/>
-
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-    <bean class="org.springframework.beans.factory.config.PreferencesPlaceholderConfigurer"/>
-
-    <jaxrs:server id="services" address="/">
-        <jaxrs:serviceBeans>
-            <bean class="org.wso2.carbon.identity.configuration.mgt.endpoint.ResourceApi"/>
-            <bean class="org.wso2.carbon.identity.configuration.mgt.endpoint.ResourceTypeApi"/>
-            <bean class="org.wso2.carbon.identity.configuration.mgt.endpoint.SearchApi"/>
-        </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
-            <bean class="org.apache.cxf.jaxrs.ext.search.SearchContextProvider"/>
-        </jaxrs:providers>
-    </jaxrs:server>
-    <cxf:bus>
-        <cxf:properties>
-            <entry key="search.query.parameter.name" value="$filter"/>
-            <entry key="search.parser">
-                <bean class="org.apache.cxf.jaxrs.ext.search.odata.ODataParser">
-                    <constructor-arg value="#{ T(org.apache.cxf.jaxrs.ext.search.SearchBean) }"/>
-                </bean>
-            </entry>
-        </cxf:properties>
-    </cxf:bus>
-</beans>
diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/web.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/web.xml
index b6427187e6cb..61f65ea9c4fa 100644
--- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/web.xml
+++ b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/web.xml
@@ -22,10 +22,7 @@
 
     <display-name>JAX-RS Simple Service</display-name>
     <description>JAX-RS Simple Service</description>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/beans.xml</param-value>
-    </context-param>
+
     <filter>
         <filter-name>HttpHeaderSecurityFilter</filter-name>
         <filter-class>org.apache.catalina.filters.HttpHeaderSecurityFilter</filter-class>
@@ -67,17 +64,31 @@
         <dispatcher>REQUEST</dispatcher>
         <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.configuration.mgt.endpoint.ResourceApi,
+                org.wso2.carbon.identity.configuration.mgt.endpoint.ResourceTypeApi,
+                org.wso2.carbon.identity.configuration.mgt.endpoint.SearchApi
+            </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.apache.cxf.jaxrs.ext.search.SearchContextProvider
+            </param-value>
+        </init-param>
     </servlet>
     <servlet-mapping>
         <servlet-name>CXFServlet</servlet-name>