Author: olamy
Date: Thu Dec 6 09:09:45 2012
New Revision: 1417782
URL: http://svn.apache.org/viewvc?rev=1417782&view=rev
Log:
use a more classic name for this bean userConfiguration#default
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
Thu Dec 6 09:09:45 2012
@@ -68,7 +68,7 @@ public class LdapBindAuthenticator
private LdapConnectionFactory connectionFactory;
@Inject
- @Named( value = "userConfiguration" )
+ @Named( value = "userConfiguration#default" )
private UserConfiguration config;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
Thu Dec 6 09:09:45 2012
@@ -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 )
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
Thu Dec 6 09:09:45 2012
@@ -80,7 +80,7 @@ public class LdapUserMapper
int maxResultCount = 0;
@Inject
- @Named(value = "userConfiguration")
+ @Named(value = "userConfiguration#default")
private UserConfiguration userConf;
@PostConstruct
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
Thu Dec 6 09:09:45 2012
@@ -63,7 +63,7 @@ public class ConfigurableLdapConnectionF
@Inject
- @Named( value = "userConfiguration" )
+ @Named( value = "userConfiguration#default" )
private UserConfiguration userConf;
// ----------------------------------------------------------------------
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
Thu Dec 6 09:09:45 2012
@@ -41,7 +41,7 @@ import java.util.List;
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
* @since 2.1
*/
-@Service("userConfiguration")
+@Service("userConfiguration#default")
public class DefaultUserConfiguration
implements UserConfiguration
{
Modified:
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/META-INF/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-data-management/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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" />
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
Thu Dec 6 09:09:45 2012
@@ -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 )
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
Thu Dec 6 09:09:45 2012
@@ -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
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
Thu Dec 6 09:09:45 2012
@@ -88,7 +88,7 @@ public class DefaultUserService
private SecuritySystem securitySystem;
@Inject
- @Named( value = "userConfiguration" )
+ @Named( value = "userConfiguration#default" )
private UserConfiguration config;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
Thu Dec 6 09:09:45 2012
@@ -44,7 +44,7 @@ public class FakeCreateAdminServiceImpl
private UserManager userManager;
@Inject
- @Named( value = "userConfiguration" )
+ @Named( value = "userConfiguration#default" )
private UserConfiguration config;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
Thu Dec 6 09:09:45 2012
@@ -34,7 +34,7 @@ import org.apache.archiva.redback.config
public abstract class AbstractCookieSettings
implements CookieSettings
{
- @Inject @Named(value="userConfiguration")
+ @Inject @Named(value="userConfiguration#default")
protected UserConfiguration config;
/**
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
Thu Dec 6 09:09:45 2012
@@ -52,7 +52,7 @@ public class DefaultUserSecurityPolicy
private PasswordRule defaultPasswordRule = new MustHavePasswordRule();
@Inject
- @Named(value = "userConfiguration")
+ @Named(value = "userConfiguration#default")
private UserConfiguration config;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
Thu Dec 6 09:09:45 2012
@@ -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;
Modified:
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
(original)
+++
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
Thu Dec 6 09:09:45 2012
@@ -33,7 +33,7 @@ public abstract class AbstractPasswordRu
{
protected boolean enabled = true;
- @Inject @Named (value="userConfiguration")
+ @Inject @Named (value="userConfiguration#default")
protected UserConfiguration config;
public boolean isEnabled()
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
Thu Dec 6 09:09:45 2012
@@ -40,7 +40,7 @@ public class ConfigurableUserManager
implements UserManager
{
@Inject
- @Named( value = "userConfiguration" )
+ @Named( value = "userConfiguration#default" )
private UserConfiguration config;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml?rev=1417782&r1=1417781&r2=1417782&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
Thu Dec 6 09:09:45 2012
@@ -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
