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

package move to o.a.a.r module redback-configuration

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310877 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-07 21:36:01 +00:00
parent e3b859bf77
commit b876810287
37 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@
import org.apache.archiva.redback.common.ldap.UserMapper;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.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.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;

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

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

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

@ -19,12 +19,12 @@
* 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;

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

@ -19,8 +19,8 @@
* 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;

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

@ -19,7 +19,7 @@
* under the License.
*/
import org.codehaus.plexus.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;

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

@ -23,7 +23,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
<bean name="userConfiguration" class="org.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>

6
redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java → redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java
View File

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

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

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

0
redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties → redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties
View File

1
redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java
View File

@ -20,6 +20,7 @@
*/
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;

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

@ -27,7 +27,7 @@
default-lazy-init="true">
<bean name="test" class="org.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>

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java
View File

@ -22,7 +22,7 @@
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;

3
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
View File

@ -24,7 +24,6 @@
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.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;

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

@ -24,7 +24,7 @@
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;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java
View File

@ -19,7 +19,7 @@
* 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;

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

@ -42,7 +42,7 @@
</property>
</bean>
<bean name="userConfiguration#custom-url" class="org.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>

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

@ -20,13 +20,13 @@
*/
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;

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

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
View File

@ -27,7 +27,7 @@
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;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java
View File

@ -20,13 +20,13 @@
*/
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;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java
View File

@ -26,7 +26,7 @@
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;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java
View File

@ -25,9 +25,9 @@
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;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml
View File

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

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

@ -40,7 +40,7 @@
</property>
</bean>
<bean name="userConfiguration" class="org.codehaus.plexus.redback.configuration.UserConfiguration">
<bean name="userConfiguration" class="org.apache.archiva.redback.configuration.UserConfiguration">
<property name="registry" ref="test-conf"/>
</bean>

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

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

3
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java
View File

@ -19,11 +19,10 @@
* 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.

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java
View File

@ -19,8 +19,8 @@
* 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;

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java
View File

@ -19,7 +19,7 @@
* 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;

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java
View File

@ -16,7 +16,7 @@
* 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;

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -20,7 +20,7 @@
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;

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

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