use a more classic name for this bean userConfiguration#default

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

diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
index bc5c757100c6489d1bc3054e1a5c714492dd21f6..a4b51fee8f342fb0d6dcbb01272c8d8aef1e6683 100644 (file)
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
@@ -68,7 +68,7 @@ public class LdapBindAuthenticator
     private LdapConnectionFactory connectionFactory;
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     @Inject

diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
index ba7d70010f1dbe552c01d72f6deba5ebfca291c6..dce4872561e8bcd32f84a7daee163abaa380487f 100644 (file)
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
@@ -43,7 +43,7 @@
     <property name="contextFactory" value="com.sun.jndi.ldap.LdapCtxFactory"/>
     <property name="password" value="secret"/>
     <property name="bindDn" value="uid=admin,ou=system"/>
-    <property name="userConf" ref="userConfiguration"/>
+    <property name="userConf" ref="userConfiguration#default"/>
   </bean>
 
   <bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.LdapUserMapper">
@@ -53,10 +53,10 @@
     <property name="userIdAttribute" value="cn"/>
     <property name="userBaseDn" value="dc=redback,dc=plexus,dc=codehaus,dc=org"/>
     <property name="userObjectClass" value="inetOrgPerson"/>
-    <property name="userConf" ref="userConfiguration"/>
+    <property name="userConf" ref="userConfiguration#default"/>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
       init-method="initialize">
     <property name="configs">
       <list>

diff --git a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
index eeb1cf6817ede5803080babf10f7c3fbcdb5b375..132651bea5c92560020382624bd9c9637e64e515 100644 (file)
--- a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
+++ b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
@@ -47,7 +47,7 @@ public class UserConfigurableJdoFactory
     private Logger log = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     private String getConfigString( String key, String currentValue, String defaultValue )

diff --git a/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml b/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
index db81fdd73df9d78be84544d888c2d8b5c3e99fe5..6c510910d0d82b7628d691fe05f9de2b69623cc7 100644 (file)
--- a/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
+++ b/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
@@ -25,6 +25,6 @@
         default-lazy-init="true">
 
   <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory">
-    <property name="config" ref="userConfiguration"/>
+    <property name="config" ref="userConfiguration#default"/>
   </bean>
 </beans>
\ No newline at end of file

diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
index 8e4f259957ef7ae5b5c29a019b8c60df90422e56..614ca015859ca43f951dc837f6d209794f9d55eb 100644 (file)
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
@@ -80,7 +80,7 @@ public class LdapUserMapper
     int maxResultCount = 0;
 
     @Inject
-    @Named(value = "userConfiguration")
+    @Named(value = "userConfiguration#default")
     private UserConfiguration userConf;
 
     @PostConstruct

diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
index e5438b9c0a615936042d4082d8d9bffba29083b9..c67da2e6b8f8a881275e7045b486304f32fb775d 100644 (file)
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
@@ -63,7 +63,7 @@ public class ConfigurableLdapConnectionFactory
 
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration userConf;
 
     // ----------------------------------------------------------------------

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 6bb89bcf2986bb950914f20b4aa918c8ae84f9a8..f9399e0655446767567e239956bd8a0d118ccc0c 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,7 +23,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="configs">
       <list>
         <value>src/test/resources/test.properties</value>

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 cf3016a13425c0da472dc25d712992e26316cf51..47bfe4b3efe64cdedde55253d069ee1e37961fdd 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")
+@Service("userConfiguration#default")
 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 fec5d211237d5bd0e0aac570215ce265ba750f1b..50fce3a8139733d96401f6223d8106faac0cbf26 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,6 @@
   <context:annotation-config />
   <context:component-scan base-package="org.apache.archiva.redback.configuration"/>
 
-  <alias name="userConfiguration" alias="userConfiguration#redback"/>
+  <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 06ea9af36a83416200765a62929fb4470f6f9396..137002f2e346d36509758a71df5cf008986581d9 100644 (file)
--- a/redback-data-management/src/test/resources/spring-context.xml
+++ b/redback-data-management/src/test/resources/spring-context.xml
@@ -29,7 +29,7 @@
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
   <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory">
-    <property name="config" ref="userConfiguration"/>
+    <property name="config" ref="userConfiguration#default"/>
     <!--
     <property name="driverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
     <property name="url" value="jdbc:derby:memory:users-test" />

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
index 273e07f29332153167cc960845b9356338448b92..bdb8580c8caa00516f051c4c13d322bdf55cccdc 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
@@ -68,7 +68,7 @@ public class MailerImpl
     private SecuritySystem securitySystem;
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     public void sendAccountValidationEmail( Collection<String> recipients, AuthenticationKey authkey, String baseUrl )

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
index 1db1a464f31b5d60f09e789c8b24218f2296d2c1..19afabd524c1ee4e851dba866e0fa568811c740b 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
@@ -49,7 +49,7 @@ public class VelocityMailGenerator
     private Logger log = LoggerFactory.getLogger( VelocityMailGenerator.class );
 
     @Inject
-    @Named(value = "userConfiguration")
+    @Named(value = "userConfiguration#default")
     private UserConfiguration config;
 
     // FIXME use the spring directly 

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index 6c0b82e964c302f037436739c00a899f3d95230c..90fa8f45b68b9c32304c082abaf4233e3d374137 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -88,7 +88,7 @@ public class DefaultUserService
     private SecuritySystem securitySystem;
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     @Inject

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
index f9610a2b79a570c7c8579bbf7d19680b6806c4df..d37c83baeced9a9252f56a9a0bdaf12fd320762b 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
@@ -44,7 +44,7 @@ public class FakeCreateAdminServiceImpl
     private UserManager userManager;
 
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     @Inject

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 906a0fd48789df25ad67bbf618feed1e9fab9954..29c6adf8b84aab2742f21e510bc7a21a3be1ad2b 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
@@ -20,14 +20,10 @@
   -->
 <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"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://cxf.apache.org/jaxrs
-           http://cxf.apache.org/schemas/jaxrs.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
       init-method="initialize">
     <property name="configs">
       <list>

diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
index 5d60d1dcf9bbfa80ed0f998fb5a14350c60aa579..add479b8e5e235ec8f021d38c74ca13d5d70cd5c 100644 (file)
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
@@ -40,7 +40,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
index 38e6ca73a192b2889e44e26aeb883d9563209cd9..dd75f723af120286941c4d98a412754fd20e1d20 100644 (file)
--- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
@@ -36,7 +36,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
index 87b23844c04f7c101b8c83f18a001e03336038cb..9d3947c10a7e8c57e8faa9a546e55fe0ffde1ae5 100644 (file)
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
@@ -34,7 +34,7 @@ import org.apache.archiva.redback.configuration.UserConfiguration;
 public abstract class AbstractCookieSettings
     implements CookieSettings
 {
-    @Inject @Named(value="userConfiguration")
+    @Inject @Named(value="userConfiguration#default")
     protected UserConfiguration config;
 
     /**

diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
index 6fefb38f9bae9ff974c1c22c5a5d8d7ea1523a56..c78cee3bfa0fa5c20ae3c9f2676605127a040920 100644 (file)
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
@@ -52,7 +52,7 @@ public class DefaultUserSecurityPolicy
     private PasswordRule defaultPasswordRule = new MustHavePasswordRule();
 
     @Inject
-    @Named(value = "userConfiguration")
+    @Named(value = "userConfiguration#default")
     private UserConfiguration config;
 
     @Inject

diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
index c16d9d9f85bee0f1b303150402f8682a43783220..8ce34194d0733449da0aa285448cbd2e35af152f 100644 (file)
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
@@ -35,7 +35,7 @@ import javax.annotation.Resource;
 public class DefaultUserValidationSettings
     implements UserValidationSettings
 {
-    @Resource( name = "userConfiguration" )
+    @Resource( name = "userConfiguration#default" )
     private UserConfiguration config;
 
     private boolean emailValidationRequired;

diff --git a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
index 73183e0edb31d3d895583bcfc03dc43d59291e41..6806584146b7e587f75e01b5bc8313dd85b50e64 100644 (file)
--- a/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
+++ b/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
@@ -33,7 +33,7 @@ public abstract class AbstractPasswordRule
 {
     protected boolean enabled = true;
 
-    @Inject @Named (value="userConfiguration")
+    @Inject @Named (value="userConfiguration#default")
     protected UserConfiguration config;
 
     public boolean isEnabled()

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index bc04bd9681d726302bd3764b0cc68db4d8f301a4..a64641847a886cb9167c1c3e12a50de61c7f79e0 100755 (executable)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -38,7 +38,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
index 9699fe7f7bed77d10b715ddfd40a0ecf5d54a578..c7b54f0397179446530981d1b213239cf3272992 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
@@ -41,7 +41,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
index 5fea76993b73c8f827db187505ebb612cce6781f..33592849e954369dd0035fb784d0241433059dd3 100755 (executable)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
@@ -37,7 +37,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
index 9ffa4420297c33a43be812f3cb05e4597199c699..b69cc120784adf4b800b470ee96840b02f313e05 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
@@ -70,7 +70,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
index 5311b624929fa9222dd91372e72f772bb2e5275f..9f59f4e9c2bd81669755d05b12735a1e6646f02e 100755 (executable)
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
@@ -39,7 +39,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml
index 38e6ca73a192b2889e44e26aeb883d9563209cd9..dd75f723af120286941c4d98a412754fd20e1d20 100644 (file)
--- a/redback-system/src/test/resources/spring-context.xml
+++ b/redback-system/src/test/resources/spring-context.xml
@@ -36,7 +36,7 @@
     </property>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

diff --git a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
index d4a3a3616c326a257702102143e1bb25e12500bd..909c831b1ee91cd4cc840dfb629715c391a077e0 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
@@ -40,7 +40,7 @@ public class ConfigurableUserManager
     implements UserManager
 {
     @Inject
-    @Named( value = "userConfiguration" )
+    @Named( value = "userConfiguration#default" )
     private UserConfiguration config;
 
     @Inject

diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
index 2db3f24aa404a9bae884497a0aee32f0c2139202..7ad0ca867adfb23ab7edadaefc2269bd851c8a16 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
@@ -27,14 +27,14 @@
            http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
   <bean name="jdoFactory#users" class="org.apache.archiva.redback.common.jdo.UserConfigurableJdoFactory">
-    <property name="config" ref="userConfiguration"/>
+    <property name="config" ref="userConfiguration#default"/>
     <property name="driverName" value="org.hsqldb.jdbcDriver"/>
     <property name="url" value="jdbc:hsqldb:mem:redback-users-tests" />
     <property name="userName" value="sa"/>
     <property name="password" value=""/>
   </bean>
 
-  <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
+  <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
     <property name="registry" ref="test-conf"/>
   </bean>
 

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 689b6b7ada74efc8662701d1588bbd340a1039f6..9d7dbd53063e8e5af9c4402aba77cd0618ed31e9 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
@@ -43,7 +43,7 @@
     <property name="contextFactory" value="com.sun.jndi.ldap.LdapCtxFactory"/>
     <property name="password" value="secret"/>
     <property name="bindDn" value="uid=admin,ou=system"/>
-    <property name="userConf" ref="userConfiguration"/>
+    <property name="userConf" ref="userConfiguration#default"/>
   </bean>
 
   <bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.LdapUserMapper">
@@ -53,7 +53,7 @@
     <property name="userIdAttribute" value="cn"/>
     <property name="userBaseDn" value="dc=redback,dc=plexus,dc=codehaus,dc=org"/>
     <property name="userObjectClass" value="inetOrgPerson"/>
-    <property name="userConf" ref="userConfiguration"/>
+    <property name="userConf" ref="userConfiguration#default"/>
   </bean>
 
 </beans>
\ No newline at end of file