You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/11/27 23:48:29 UTC
svn commit: r1414451 - in /archiva/redback/redback-core/trunk:
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/
redback-authentication/redback-authenticati...
Author: olamy
Date: Tue Nov 27 22:48:18 2012
New Revision: 1414451
URL: http://svn.apache.org/viewvc?rev=1414451&view=rev
Log:
rename UserConfiguration to DefaultUserConfiguration to be able to extract an interface
Added:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java (contents, props changed)
- copied, changed from r1414237, archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java (contents, props changed)
- copied, changed from r1414237, archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java
Removed:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java
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-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/test/resources/META-INF/spring-context.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
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-common-integrations/src/test/resources/spring-context.xml
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
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -21,7 +21,7 @@ package org.apache.archiva.redback.authe
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;
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.commo
*/
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 class UserConfigurableJdoFactory
super.initialize();
}
- public UserConfiguration getConfig()
+ public DefaultUserConfiguration getConfig()
{
return config;
}
- public void setConfig( UserConfiguration config )
+ public void setConfig( DefaultUserConfiguration config )
{
this.config = config;
}
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.commo
* 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 class LdapUserMapper
getPasswordAttribute() };
}
- public UserConfiguration getUserConf()
+ public DefaultUserConfiguration getUserConf()
{
return userConf;
}
- public void setUserConf( UserConfiguration userConf )
+ public void setUserConf( DefaultUserConfiguration userConf )
{
this.userConf = userConf;
}
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.commo
* 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 ConfigurableLdapConnectionF
@Inject
@Named( value = "userConfiguration" )
- private UserConfiguration userConf;
+ private DefaultUserConfiguration userConf;
// ----------------------------------------------------------------------
// Component Lifecycle
@@ -267,12 +267,12 @@ public class ConfigurableLdapConnectionF
this.extraProperties = extraProperties;
}
- public UserConfiguration getUserConf()
+ public DefaultUserConfiguration getUserConf()
{
return userConf;
}
- public void setUserConf( UserConfiguration userConf )
+ public void setUserConf( DefaultUserConfiguration userConf )
{
this.userConf = 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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 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.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration">
<property name="configs">
<list>
<value>src/test/resources/test.properties</value>
Copied: archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java (from r1414237, archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java?p2=archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java&p1=archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java&r1=1414237&r2=1414451&rev=1414451&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java Tue Nov 27 22:48:18 2012
@@ -42,7 +42,7 @@ import java.util.List;
*
*/
@Service( "userConfiguration" )
-public class UserConfiguration
+public class DefaultUserConfiguration
{
private static final String DEFAULT_CONFIG_RESOURCE = "org/apache/archiva/redback/config-defaults.properties";
Propchange: archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java (from r1414237, archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java?p2=archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java&p1=archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java&r1=1414237&r2=1414451&rev=1414451&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/UserConfigurationTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java Tue Nov 27 22:48:18 2012
@@ -20,7 +20,6 @@ package org.apache.archiva.redback.confi
*/
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.Inject;
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 )
{
Propchange: archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/apache/archiva/redback/configuration/DefaultUserConfigurationTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml?rev=1414451&r1=1414450&r2=1414451&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/test/resources/META-INF/spring-context.xml Tue Nov 27 22:48:18 2012
@@ -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>
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.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/checks/security/AdminAutoCreateCheck.java?rev=1414451&r1=1414450&r2=1414451&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java Tue Nov 27 22:48:18 2012
@@ -20,7 +20,7 @@ package org.apache.archiva.redback.integ
*/
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;
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -33,7 +33,7 @@ import javax.mail.internet.AddressExcept
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 )
{
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -25,7 +25,7 @@ import org.apache.velocity.app.VelocityE
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 @@ public class VelocityMailGenerator
}
- public UserConfiguration getConfig()
+ public DefaultUserConfiguration getConfig()
{
return config;
}
- public void setConfig( UserConfiguration config )
+ public void setConfig( DefaultUserConfiguration config )
{
this.config = config;
}
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml?rev=1414451&r1=1414450&r2=1414451&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -23,7 +23,7 @@ import net.sf.ehcache.CacheManager;
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;
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -19,9 +19,9 @@ package org.apache.archiva.redback.rest.
* 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;
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -22,7 +22,7 @@ package org.apache.archiva.redback.polic
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 AbstractCookieSett
implements CookieSettings
{
@Inject @Named(value="userConfiguration")
- protected UserConfiguration config;
+ protected DefaultUserConfiguration config;
/**
* Timeout (in minutes) for the sign on cookie.
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.polic
* 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 class DefaultUserSecurityPolicy
return signonCookieSettings;
}
- public UserConfiguration getConfig()
+ public DefaultUserConfiguration getConfig()
{
return config;
}
- public void setConfig( UserConfiguration config )
+ public void setConfig( DefaultUserConfiguration config )
{
this.config = config;
}
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.polic
* 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 DefaultUserValidationSettin
implements UserValidationSettings
{
@Resource (name="userConfiguration")
- private UserConfiguration config;
+ private DefaultUserConfiguration 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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -16,7 +16,7 @@ package org.apache.archiva.redback.polic
* 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 AbstractPasswordRu
protected boolean enabled = true;
@Inject @Named (value="userConfiguration")
- protected UserConfiguration config;
+ protected DefaultUserConfiguration 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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -16,11 +16,11 @@ package org.apache.archiva.redback.users
* 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;
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=1414451&r1=1414450&r2=1414451&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 Tue Nov 27 22:48:18 2012
@@ -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>