[archiva-redback-core] branch master updated: Cleaning up of spring config

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 39fab59  Cleaning up of spring config
39fab59 is described below

commit 39fab59ff29f15bb7b1d7b7eda805f8d1113dd95
Author: Martin Stockhammer <marti...@apache.org>
AuthorDate: Mon May 31 21:43:32 2021 +0200

    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 104d858..ede7611 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>