Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-12-06 09:09:45 +00:00
parent 2f75fce0e4
commit 2907ffa101
30 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
View File

@ -68,7 +68,7 @@ public class LdapBindAuthenticator
private LdapConnectionFactory connectionFactory;
@Inject
@Named( value = "userConfiguration" )
@Named( value = "userConfiguration#default" )
private UserConfiguration config;
@Inject

6
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml
View File

@ -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>

2
redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java
View File

@ -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 )

2
redback-common/redback-common-jdo/src/main/resources/META-INF/spring-context.xml
View File

@ -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>

2
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java
View File

@ -80,7 +80,7 @@ public class LdapUserMapper
int maxResultCount = 0;
@Inject
@Named(value = "userConfiguration")
@Named(value = "userConfiguration#default")
private UserConfiguration userConf;
@PostConstruct

2
redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java
View File

@ -63,7 +63,7 @@ public class ConfigurableLdapConnectionFactory
@Inject
@Named( value = "userConfiguration" )
@Named( value = "userConfiguration#default" )
private UserConfiguration userConf;
// ----------------------------------------------------------------------

2
redback-common/redback-common-ldap/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
View File

@ -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
{

2
redback-configuration/src/main/resources/META-INF/spring-context.xml
View File

@ -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>

2
redback-data-management/src/test/resources/spring-context.xml
View File

@ -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" />

2
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java
View File

@ -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 )

2
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
View File

@ -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

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
View File

@ -88,7 +88,7 @@ public class DefaultUserService
private SecuritySystem securitySystem;
@Inject
@Named( value = "userConfiguration" )
@Named( value = "userConfiguration#default" )
private UserConfiguration config;
@Inject

2
redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
View File

@ -44,7 +44,7 @@ public class FakeCreateAdminServiceImpl
private UserManager userManager;
@Inject
@Named( value = "userConfiguration" )
@Named( value = "userConfiguration#default" )
private UserConfiguration config;
@Inject

8
redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
View File

@ -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;
/**

2
redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
View File

@ -52,7 +52,7 @@ public class DefaultUserSecurityPolicy
private PasswordRule defaultPasswordRule = new MustHavePasswordRule();
@Inject
@Named(value = "userConfiguration")
@Named(value = "userConfiguration#default")
private UserConfiguration config;
@Inject

2
redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
View File

@ -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;

2
redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
View File

@ -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()

2
redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
View File

@ -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>

2
redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-system/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java
View File

@ -40,7 +40,7 @@ public class ConfigurableUserManager
implements UserManager
{
@Inject
@Named( value = "userConfiguration" )
@Named( value = "userConfiguration#default" )
private UserConfiguration config;
@Inject

4
redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml
View File

@ -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>

4
redback-users/redback-users-providers/redback-users-ldap/src/test/resources/spring-context.xml
View File

@ -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>