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

rename UserConfiguration to DefaultUserConfiguration to be able to extract an interface

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1414451 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-11-27 22:48:18 +00:00
parent f22c79fe22
commit b23cf34cc0
30 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@
import org.apache.archiva.redback.common.ldap.UserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException;
@ -65,7 +65,7 @@ public class LdapBindAuthenticator
@Inject
@Named( value = "userConfiguration" )
private UserConfiguration config;
private DefaultUserConfiguration config;
@Inject
private LdapCacheService ldapCacheService;

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

@ -56,7 +56,7 @@
<property name="userConf" ref="userConfiguration"/>
</bean>
<bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration"
<bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration"
init-method="initialize">
<property name="configs">
<list>

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

@ -20,7 +20,7 @@
*/
import org.apache.archiva.redback.components.jdo.DefaultConfigurableJdoFactory;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
@ -48,7 +48,7 @@ public class UserConfigurableJdoFactory
@Inject
@Named( value = "userConfiguration" )
private UserConfiguration config;
private DefaultUserConfiguration config;
private String getConfigString( String key, String currentValue, String defaultValue )
{
@ -116,12 +116,12 @@ public void initialize()
super.initialize();
}
public UserConfiguration getConfig()
public DefaultUserConfiguration getConfig()
{
return config;
}
public void setConfig( UserConfiguration config )
public void setConfig( DefaultUserConfiguration config )
{
this.config = config;
}

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

@ -19,7 +19,7 @@
* under the License.
*/
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
@ -81,7 +81,7 @@ public class LdapUserMapper
@Inject
@Named( value = "userConfiguration" )
private UserConfiguration userConf;
private DefaultUserConfiguration userConf;
@PostConstruct
public void initialize()
@ -301,12 +301,12 @@ public String[] getReturningAttributes()
getPasswordAttribute() };
}
public UserConfiguration getUserConf()
public DefaultUserConfiguration getUserConf()
{
return userConf;
}
public void setUserConf( UserConfiguration userConf )
public void setUserConf( DefaultUserConfiguration userConf )
{
this.userConf = userConf;
}

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

@ -19,7 +19,7 @@
* under the License.
*/
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@ -90,7 +90,7 @@ public class ConfigurableLdapConnectionFactory
@Inject
@Named( value = "userConfiguration" )
private UserConfiguration userConf;
private DefaultUserConfiguration userConf;
// ----------------------------------------------------------------------
// Component Lifecycle
@ -267,12 +267,12 @@ public void setExtraProperties( Properties extraProperties )
this.extraProperties = extraProperties;
}
public UserConfiguration getUserConf()
public DefaultUserConfiguration getUserConf()
{
return userConf;
}
public void setUserConf( UserConfiguration userConf )
public void setUserConf( DefaultUserConfiguration userConf )
{
this.userConf = 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.UserConfiguration">
<bean name="userConfiguration" 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/UserConfiguration.java → redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
View File

@ -42,7 +42,7 @@
*
*/
@Service( "userConfiguration" )
public class UserConfiguration
public class DefaultUserConfiguration
{
private static final String DEFAULT_CONFIG_RESOURCE = "org/apache/archiva/redback/config-defaults.properties";

7
redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java → redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
View File

@ -20,7 +20,6 @@
*/
import junit.framework.TestCase;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.util.StringUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -31,19 +30,19 @@
import javax.inject.Named;
/**
* UserConfigurationTest
* DefaultUserConfigurationTest
*
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
public class UserConfigurationTest
public class DefaultUserConfigurationTest
extends TestCase
{
@Inject @Named(value = "test")
UserConfiguration config;
DefaultUserConfiguration config;
private void assertEmpty( String str )
{

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

@ -27,7 +27,7 @@
default-lazy-init="true">
<bean name="test" class="org.apache.archiva.redback.configuration.UserConfiguration">
<bean name="test" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
<property name="configs">
<list>
<value>src/test/resources/props/test-another.properties</value>

4
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
View File

@ -20,7 +20,7 @@
*/
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.role.RoleManagerException;
@ -68,7 +68,7 @@ public class AdminAutoCreateCheck
private UserManager userManager;
@Inject
private UserConfiguration config;
private DefaultUserConfiguration config;
@Inject
protected SecuritySystem securitySystem;

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

@ -33,7 +33,7 @@
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.policy.UserValidationSettings;
@ -66,7 +66,7 @@ public class MailerImpl
private SecuritySystem securitySystem;
@Inject @Named(value="userConfiguration")
private UserConfiguration config;
private DefaultUserConfiguration config;
public void sendAccountValidationEmail( Collection<String> recipients, AuthenticationKey authkey, String baseUrl )
{

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

@ -25,7 +25,7 @@
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@ -50,7 +50,7 @@ public class VelocityMailGenerator
@Inject
@Named( value = "userConfiguration" )
private UserConfiguration config;
private DefaultUserConfiguration config;
// FIXME use the spring directly
@Inject
@ -130,12 +130,12 @@ private VelocityContext createVelocityContext( AuthenticationKey authkey, String
}
public UserConfiguration getConfig()
public DefaultUserConfiguration getConfig()
{
return config;
}
public void setConfig( UserConfiguration config )
public void setConfig( DefaultUserConfiguration config )
{
this.config = config;
}

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

@ -42,7 +42,7 @@
</property>
</bean>
<bean name="userConfiguration#custom-url" class="org.apache.archiva.redback.configuration.UserConfiguration">
<bean name="userConfiguration#custom-url" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
<property name="configs">
<list>
<value>src/test/config/mail.properties</value>

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

@ -23,7 +23,7 @@
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator;
import org.apache.archiva.redback.integration.mail.Mailer;
import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants;
@ -87,7 +87,7 @@ public class DefaultUserService
private SecuritySystem securitySystem;
@Inject
private UserConfiguration config;
private DefaultUserConfiguration config;
@Inject
private RoleManager roleManager;

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

@ -19,9 +19,9 @@
* under the License.
*/
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.rest.api.services.UserService;
@ -44,7 +44,7 @@ public class FakeCreateAdminServiceImpl
private UserManager userManager;
@Inject
private UserConfiguration config;
private DefaultUserConfiguration config;
@Inject
private RoleManager roleManager;

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

@ -27,7 +27,7 @@
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd">
<bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration"
<bean name="userConfiguration" 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.UserConfiguration">
<bean name="userConfiguration" 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.UserConfiguration">
<bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>

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

@ -22,7 +22,7 @@
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
/**
* Base class for cookie settings. These will only differ by their configuration keys.
@ -35,7 +35,7 @@ public abstract class AbstractCookieSettings
implements CookieSettings
{
@Inject @Named(value="userConfiguration")
protected UserConfiguration config;
protected DefaultUserConfiguration config;
/**
* Timeout (in minutes) for the sign on cookie.

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

@ -19,7 +19,7 @@
* under the License.
*/
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.policy.rules.MustHavePasswordRule;
import org.slf4j.Logger;
@ -65,7 +65,7 @@ public class DefaultUserSecurityPolicy
@Inject
@Named( value = "userConfiguration" )
private UserConfiguration config;
private DefaultUserConfiguration config;
@Inject
@Named( value = "passwordEncoder#sha256" )
@ -402,12 +402,12 @@ public CookieSettings getSignonCookieSettings()
return signonCookieSettings;
}
public UserConfiguration getConfig()
public DefaultUserConfiguration getConfig()
{
return config;
}
public void setConfig( UserConfiguration config )
public void setConfig( DefaultUserConfiguration config )
{
this.config = config;
}

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

@ -19,7 +19,7 @@
* under the License.
*/
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
@ -36,7 +36,7 @@ public class DefaultUserValidationSettings
implements UserValidationSettings
{
@Resource (name="userConfiguration")
private UserConfiguration config;
private DefaultUserConfiguration config;
private boolean emailValidationRequired;

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

@ -16,7 +16,7 @@
* limitations under the License.
*/
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.archiva.redback.policy.PasswordRule;
import javax.inject.Inject;
@ -34,7 +34,7 @@ public abstract class AbstractPasswordRule
protected boolean enabled = true;
@Inject @Named (value="userConfiguration")
protected UserConfiguration config;
protected DefaultUserConfiguration 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.UserConfiguration">
<bean name="userConfiguration" 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.UserConfiguration">
<bean name="userConfiguration" 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.UserConfiguration">
<bean name="userConfiguration" 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.UserConfiguration">
<bean name="userConfiguration" 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.UserConfiguration">
<bean name="userConfiguration" 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.UserConfiguration">
<bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>

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

@ -16,11 +16,11 @@
* limitations under the License.
*/
import org.apache.archiva.redback.configuration.DefaultUserConfiguration;
import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserQuery;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
@ -40,7 +40,7 @@ public class ConfigurableUserManager
{
@Inject
@Named( value = "userConfiguration" )
private UserConfiguration config;
private DefaultUserConfiguration config;
@Inject
private ApplicationContext applicationContext;

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

@ -34,7 +34,7 @@
<property name="password" value=""/>
</bean>
<bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>