[Spring Cleanup] Remove spring from config mgmt endpoint and root pom…

….xml
lashinijay · Jan 27, 2025 · 4e708d4 · 4e708d4
1 parent 119dd98
commit 4e708d4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 72 deletions.
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
@@ -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/...mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/beans.xml b/...mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/beans.xml
diff --git a/...n-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/src/main/webapp/WEB-INF/web.xml b/...n-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>

diff --git a/pom.xml b/pom.xml
@@ -1755,11 +1755,6 @@
                 <artifactId>httpclient</artifactId>
                 <version>${apache.httpcomponents.httpclient.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>${springframework.spring-web.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.central.log.mgt</artifactId>
@@ -1868,7 +1863,6 @@
         <apache.cxf-rt-frontend-jaxrs.version>3.6.4</apache.cxf-rt-frontend-jaxrs.version>
         <apache.cxf-rt-rs-service-description.version>3.3.7</apache.cxf-rt-rs-service-description.version>
         <codehaus.jettison.version>1.4.0</codehaus.jettison.version>
-        <springframework.spring-web.version>5.1.1.RELEASE</springframework.spring-web.version>
         <jaxrx.jsr311.api.version>1.1.1</jaxrx.jsr311.api.version>
         <apache.httpcomponents.httpclient.version>4.3.5</apache.httpcomponents.httpclient.version>