From 39fab59ff29f15bb7b1d7b7eda805f8d1113dd95 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Mon, 31 May 2021 21:43:32 +0200
Subject: [PATCH] Cleaning up of spring config

---
 .../src/main/resources/META-INF/spring-context.xml          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml
index 104d858c..ede76117 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -29,11 +29,11 @@
            http://cxf.apache.org/jaxrs
            http://cxf.apache.org/schemas/jaxrs.xsd">
 
-  <import resource="classpath:META-INF/cxf/cxf.xml"/>
+  <import resource="classpath*:META-INF/cxf/cxf.xml"/>
   <!--
   <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/>
   -->
-  <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+  <import resource="classpath*:META-INF/cxf/cxf-servlet.xml"/>
 
   <context:annotation-config />
   <context:component-scan
@@ -97,8 +97,6 @@
       <ref bean="v2.userService#rest"/>
       <ref bean="v2.authenticationService#rest"/>
       <ref bean="v2.roleService#rest"/>
-      <ref bean="utilServices#rest"/>
-      <ref bean="passwordService#rest"/>
       <ref bean="v2.groupService#rest"/>
     </jaxrs:serviceBeans>