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/04/07 23:36:03 UTC
svn commit: r1310877 - 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: Sat Apr 7 21:36:01 2012
New Revision: 1310877
URL: http://svn.apache.org/viewvc?rev=1310877&view=rev
Log:
package move to o.a.a.r module redback-configuration
Added:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
- copied, changed from r1310866, archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
- copied unchanged from r1310866, archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties
Removed:
archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/codehaus/
archiva/redback/redback-core/trunk/redback-configuration/src/main/resources/org/codehaus/
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/main/resources/META-INF/spring-context.xml
archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java
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/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.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/codehaus/redback/rest/services/DefaultUserService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java
archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.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/codehaus/plexus/redback/policy/AbstractCookieSettings.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java
archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -21,6 +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.commons.lang.StringUtils;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException;
@@ -29,7 +30,6 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -56,7 +56,7 @@
<property name="userConf" ref="userConfiguration"/>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration"
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration"
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -19,12 +19,12 @@ package org.apache.archiva.redback.commo
* under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.interpolation.InterpolationException;
import org.codehaus.plexus.interpolation.PropertiesBasedValueSource;
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -19,8 +19,8 @@ package org.apache.archiva.redback.commo
* under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -19,7 +19,7 @@ package org.apache.archiva.redback.commo
* under the License.
*/
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 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.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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/UserConfiguration.java (from r1310866, archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/codehaus/plexus/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/UserConfiguration.java?p2=archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java&p1=archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java&r1=1310866&r2=1310877&rev=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java Sat Apr 7 21:36:01 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.redback.configuration;
+package org.apache.archiva.redback.configuration;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -44,7 +44,7 @@ import java.util.List;
@Service( "userConfiguration" )
public class UserConfiguration
{
- private static final String DEFAULT_CONFIG_RESOURCE = "org/codehaus/plexus/redback/config-defaults.properties";
+ private static final String DEFAULT_CONFIG_RESOURCE = "org/apache/archiva/redback/config-defaults.properties";
protected Logger log = LoggerFactory.getLogger( getClass() );
@@ -57,7 +57,7 @@ public class UserConfiguration
private Registry lookupRegistry;
- private static final String PREFIX = "org.codehaus.plexus.redback";
+ private static final String PREFIX = "org.apache.archiva.redback";
@Inject
@Named( value = "commons-configuration" )
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -27,6 +27,6 @@
default-lazy-init="true">
<context:annotation-config />
- <context:component-scan base-package="org.codehaus.plexus.redback.configuration"/>
+ <context:component-scan base-package="org.apache.archiva.redback.configuration"/>
</beans>
\ No newline at end of file
Modified: archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java Sat Apr 7 21:36:01 2012
@@ -20,6 +20,7 @@ package org.codehaus.plexus.redback.conf
*/
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;
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -27,7 +27,7 @@
default-lazy-init="true">
- <bean name="test" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="test" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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/codehaus/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/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java Sat Apr 7 21:36:01 2012
@@ -22,7 +22,7 @@ package org.codehaus.redback.integration
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Role;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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/codehaus/redback/integration/mail/MailerImpl.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java Sat Apr 7 21:36:01 2012
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
import javax.mail.Address;
@@ -34,7 +33,7 @@ import javax.mail.internet.AddressExcept
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.policy.UserValidationSettings;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/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/codehaus/redback/integration/mail/VelocityMailGenerator.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java Sat Apr 7 21:36:01 2012
@@ -24,7 +24,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.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java Sat Apr 7 21:36:01 2012
@@ -19,7 +19,7 @@ package org.codehaus.redback.integration
* under the License.
*/
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -42,7 +42,7 @@
</property>
</bean>
- <bean name="userConfiguration#custom-url" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration#custom-url" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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/codehaus/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/codehaus/redback/rest/services/DefaultUserService.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java Sat Apr 7 21:36:01 2012
@@ -20,13 +20,13 @@ package org.codehaus.redback.rest.servic
*/
import net.sf.ehcache.CacheManager;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.cache.Cache;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManager;
import org.codehaus.plexus.redback.keys.KeyManagerException;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/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/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java Sat Apr 7 21:36:01 2012
@@ -20,7 +20,7 @@ package org.codehaus.redback.rest.servic
*/
import org.apache.archiva.redback.users.UserManager;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.redback.rest.api.services.UserService;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java Sat Apr 7 21:36:01 2012
@@ -27,7 +27,7 @@ import org.apache.archiva.redback.authen
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.keys.KeyNotFoundException;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java Sat Apr 7 21:36:01 2012
@@ -20,13 +20,13 @@ package org.codehaus.plexus.redback.stru
*/
import org.apache.archiva.redback.authentication.AuthenticationException;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationConstants;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.role.RoleManager;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java Sat Apr 7 21:36:01 2012
@@ -26,7 +26,7 @@ import org.apache.archiva.redback.users.
import org.apache.commons.lang.StringUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.system.SecuritySession;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java Sat Apr 7 21:36:01 2012
@@ -25,9 +25,9 @@ import java.util.Map;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.ServletActionContext;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml Sat Apr 7 21:36:01 2012
@@ -77,7 +77,7 @@
</configuration>
<requirements>
<requirement>
- <role>org.codehaus.plexus.redback.configuration.UserConfiguration</role>
+ <role>org.apache.archiva.redback.configuration.UserConfiguration</role>
<field-name>userConf</field-name>
</requirement>
</requirements>
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -40,7 +40,7 @@
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -39,7 +39,7 @@
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>
Modified: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java Sat Apr 7 21:36:01 2012
@@ -19,11 +19,10 @@ package org.codehaus.plexus.redback.poli
* under the License.
*/
-import javax.annotation.Resource;
import javax.inject.Inject;
import javax.inject.Named;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
/**
* Base class for cookie settings. These will only differ by their configuration keys.
Modified: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java Sat Apr 7 21:36:01 2012
@@ -19,8 +19,8 @@ package org.codehaus.plexus.redback.poli
* under the License.
*/
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.User;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.rules.MustHavePasswordRule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java Sat Apr 7 21:36:01 2012
@@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.poli
* under the License.
*/
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
Modified: archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java?rev=1310877&r1=1310876&r2=1310877&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java (original)
+++ archiva/redback/redback-core/trunk/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java Sat Apr 7 21:36:01 2012
@@ -16,7 +16,7 @@ package org.codehaus.plexus.redback.poli
* limitations under the License.
*/
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.PasswordRule;
import javax.inject.Inject;
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -41,7 +41,7 @@
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -44,7 +44,7 @@
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -40,7 +40,7 @@
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -73,7 +73,7 @@
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -42,7 +42,7 @@
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -39,7 +39,7 @@
</property>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -20,7 +20,7 @@ import org.apache.archiva.redback.users.
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
-import org.codehaus.plexus.redback.configuration.UserConfiguration;
+import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserQuery;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
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=1310877&r1=1310876&r2=1310877&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 Sat Apr 7 21:36:01 2012
@@ -34,7 +34,7 @@
<property name="password" value=""/>
</bean>
- <bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
+ <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>