userConfiguration#default bean must be know declared tru an alias to avoid duplicate...

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1417908 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
index 56d475fc2f169f59871328034a1c09a5bd3dd009..c08f9fcec5a9fc8f0c757c5c2506c7cfee754bed 100644 (file)
--- a/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
+++ b/redback-common/redback-common-ldap/src/test/java/org/apache/archiva/redback/common/ldap/LdapUserMapperTest.java
@@ -30,7 +30,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 @RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class LdapUserMapperTest
     extends TestCase
 {

diff --git a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
index f9399e0655446767567e239956bd8a0d118ccc0c..512c7a763f201b2af041d0b1e24841934d914ccf 100644 (file)
--- a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
+++ b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
@@ -23,12 +23,14 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#redback" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="configs">
       <list>
         <value>src/test/resources/test.properties</value>
       </list>
     </property>
   </bean>
+
+  <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
  
 </beans>
\ No newline at end of file

diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
index 47bfe4b3efe64cdedde55253d069ee1e37961fdd..0277dc99da417b18340f76184f8da4e7b7fc8e6a 100644 (file)
--- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
+++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
@@ -41,7 +41,7 @@ import java.util.List;
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @since 2.1
  */
-@Service("userConfiguration#default")
+@Service("userConfiguration#redback")
 public class DefaultUserConfiguration
     implements UserConfiguration
 {

diff --git a/redback-configuration/src/main/resources/META-INF/spring-context.xml b/redback-configuration/src/main/resources/META-INF/spring-context.xml
index 50fce3a8139733d96401f6223d8106faac0cbf26..c1edf21fd649c1753d821970219ce8f3fe6870af 100644 (file)
--- a/redback-configuration/src/main/resources/META-INF/spring-context.xml
+++ b/redback-configuration/src/main/resources/META-INF/spring-context.xml
@@ -29,6 +29,4 @@
   <context:annotation-config />
   <context:component-scan base-package="org.apache.archiva.redback.configuration"/>
 
-  <alias name="userConfiguration#default" alias="userConfiguration#redback"/>
- 
 </beans>
\ No newline at end of file

diff --git a/redback-data-management/src/test/resources/spring-context.xml b/redback-data-management/src/test/resources/spring-context.xml
index 137002f2e346d36509758a71df5cf008986581d9..4a6022790ba3fc8df2cf690f1f16df7f2381fdd9 100644 (file)
--- a/redback-data-management/src/test/resources/spring-context.xml
+++ b/redback-data-management/src/test/resources/spring-context.xml
@@ -42,4 +42,6 @@
     <property name="password" value=""/>
   </bean>
 
+  <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
 </beans>
\ No newline at end of file

diff --git a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
index 2b706ba84d5cc03305dc37edb273eb68d592f969..fc4f0ad0384298c9d7d06b48cf41df9f3ba7cf3d 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
@@ -55,4 +55,6 @@
     <property name="velocityEngine" ref="velocityEngine#redback"/>
   </bean>
 
+  <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
 </beans>
\ No newline at end of file

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
index 29c6adf8b84aab2742f21e510bc7a21a3be1ad2b..d5077f438fe6024f1840dcfb722b3d0fff31394b 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
@@ -40,4 +40,6 @@
 
   </bean>
 
+  <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
 </beans>
\ No newline at end of file

diff --git a/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
index e12bd391562b62eb908bacf11397fb9b6989822d..926b77aaac39e2daabd0b7a4150e04c11b7cf762 100644 (file)
--- a/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
@@ -20,11 +20,8 @@
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
        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://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
        default-lazy-init="true">
 
   <bean name="userManager#cached" class="org.apache.archiva.redback.users.cached.CachedUserManager">
@@ -44,4 +41,7 @@
     <property name="timeToIdleSeconds" value="1800"/>
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
+
+
+  <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
 </beans>
\ No newline at end of file

diff --git a/redback-users/redback-authentication-users/src/test/resources/spring-context.xml b/redback-users/redback-authentication-users/src/test/resources/spring-context.xml
index a1b6c7c2f331bc47217ef12ec724c17bed88c8ba..33625b862aa9e9c296b1b11c9d411cd990d82126 100644 (file)
--- a/redback-users/redback-authentication-users/src/test/resources/spring-context.xml
+++ b/redback-users/redback-authentication-users/src/test/resources/spring-context.xml
@@ -20,11 +20,8 @@
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
        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://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
        default-lazy-init="true">
 
   <bean name="authenticator#user-manager" class="org.apache.archiva.redback.authentication.users.UserManagerAuthenticator">
@@ -34,4 +31,6 @@
 
   <alias name="userManager#memory" alias="userManager#jdo"/>
 
+  <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
 </beans>
\ No newline at end of file

diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
index c9d8dfd2bd55cb0843e53ffc6d27a01df56efddd..916edcb3509ad47904aaa4a6ccb7342ef0b0fcb0 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
@@ -42,5 +42,6 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
+  <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
 
 </beans>
\ No newline at end of file

diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
index 7283c3b8f8fac898d82b7aede6ce1325f3d0693a..b5cbfaacf8be19bc62b3b3279f499387ec144df7 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
@@ -61,7 +61,7 @@ import java.util.List;
  */  
 
 @RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class LdapUserManagerTest
     extends TestCase
 {

diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
index de529f8387403287ed3b5b52fc19a2b6a7d8026f..004075bac79b778d141e2f234a89dfb50816a951 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/service/LdapCacheServiceTest.java
@@ -34,7 +34,7 @@ import javax.inject.Inject;
  * @version
  */
 @RunWith( SpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
 public class LdapCacheServiceTest
     extends TestCase
 {

diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
index 9d7dbd53063e8e5af9c4402aba77cd0618ed31e9..0db63d91a3e9efd780ae1b5db81fc79855cb9098 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
@@ -55,5 +55,6 @@
     <property name="userObjectClass" value="inetOrgPerson"/>
     <property name="userConf" ref="userConfiguration#default"/>
   </bean>
+  <alias name="userConfiguration#redback" alias="userConfiguration#default"/>
 
 </beans>
\ No newline at end of file