From b876810287f5afa4d94dc853aeca9fba0661d5b4 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 7 Apr 2012 21:36:01 +0000 Subject: [PATCH] package move to o.a.a.r module redback-configuration git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310877 13f79535-47bb-0310-9956-ffa450edef68 --- .../redback/authentication/ldap/LdapBindAuthenticator.java | 2 +- .../src/test/resources/META-INF/spring-context.xml | 2 +- .../redback/common/jdo/UserConfigurableJdoFactory.java | 2 +- .../apache/archiva/redback/common/ldap/LdapUserMapper.java | 2 +- .../ldap/connection/ConfigurableLdapConnectionFactory.java | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva}/redback/configuration/UserConfiguration.java | 6 +++--- .../src/main/resources/META-INF/spring-context.xml | 2 +- .../archiva}/redback/config-defaults.properties | 0 .../plexus/redback/configuration/UserConfigurationTest.java | 1 + .../src/test/resources/META-INF/spring-context.xml | 2 +- .../integration/checks/security/AdminAutoCreateCheck.java | 2 +- .../org/codehaus/redback/integration/mail/MailerImpl.java | 3 +-- .../redback/integration/mail/VelocityMailGenerator.java | 2 +- .../redback/integration/taglib/jsp/IfConfiguredTag.java | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../codehaus/redback/rest/services/DefaultUserService.java | 2 +- .../redback/rest/services/FakeCreateAdminServiceImpl.java | 2 +- .../codehaus/plexus/redback/struts2/action/LoginAction.java | 2 +- .../redback/struts2/action/admin/AddAdminUserAction.java | 2 +- .../struts2/interceptor/ForceAdminUserInterceptor.java | 2 +- .../struts2/interceptor/PolicyEnforcementInterceptor.java | 2 +- .../redback/struts2/action/admin/SystemInfoActionTest.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../redback-keys-jdo/src/test/resources/spring-context.xml | 2 +- .../plexus/redback/policy/AbstractCookieSettings.java | 3 +-- .../plexus/redback/policy/DefaultUserSecurityPolicy.java | 2 +- .../redback/policy/DefaultUserValidationSettings.java | 2 +- .../plexus/redback/policy/rules/AbstractPasswordRule.java | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../redback-rbac-jdo/src/test/resources/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../src/test/resources/jpox-spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- redback-system/src/test/resources/spring-context.xml | 2 +- .../redback/users/configurable/ConfigurableUserManager.java | 2 +- .../redback-users-jdo/src/test/resources/spring-context.xml | 2 +- 37 files changed, 38 insertions(+), 39 deletions(-) rename redback-configuration/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/configuration/UserConfiguration.java (96%) rename redback-configuration/src/main/resources/org/{codehaus/plexus => apache/archiva}/redback/config-defaults.properties (100%) diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java index 217ffdaa..91cd2bf9 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java @@ -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; diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml index 1d1e2dc4..491f850a 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml @@ -56,7 +56,7 @@ - diff --git a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java index 9dea720b..8be9c9c2 100644 --- a/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java +++ b/redback-common/redback-common-jdo/src/main/java/org/apache/archiva/redback/common/jdo/UserConfigurableJdoFactory.java @@ -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; diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java index 1faf5eb6..f75c284a 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/LdapUserMapper.java @@ -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; diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java index 6e784c9f..e6beb6ed 100644 --- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java +++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/ConfigurableLdapConnectionFactory.java @@ -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; diff --git a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml index a4ed12b68..1181c9f3 100644 --- a/redback-common/redback-common-ldap/src/test/resources/spring-context.xml +++ b/redback-common/redback-common-ldap/src/test/resources/spring-context.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> - + src/test/resources/test.properties diff --git a/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java similarity index 96% rename from redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java rename to redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java index e460aae2..138bfa54 100644 --- a/redback-configuration/src/main/java/org/codehaus/plexus/redback/configuration/UserConfiguration.java +++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/UserConfiguration.java @@ -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" ) diff --git a/redback-configuration/src/main/resources/META-INF/spring-context.xml b/redback-configuration/src/main/resources/META-INF/spring-context.xml index 26dbeeb6..c3a4146b 100644 --- a/redback-configuration/src/main/resources/META-INF/spring-context.xml +++ b/redback-configuration/src/main/resources/META-INF/spring-context.xml @@ -27,6 +27,6 @@ default-lazy-init="true"> - + \ No newline at end of file diff --git a/redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties b/redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties similarity index 100% rename from redback-configuration/src/main/resources/org/codehaus/plexus/redback/config-defaults.properties rename to redback-configuration/src/main/resources/org/apache/archiva/redback/config-defaults.properties diff --git a/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java b/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java index 8d41a0c3..02bbf723 100644 --- a/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java +++ b/redback-configuration/src/test/java/org/codehaus/plexus/redback/configuration/UserConfigurationTest.java @@ -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; diff --git a/redback-configuration/src/test/resources/META-INF/spring-context.xml b/redback-configuration/src/test/resources/META-INF/spring-context.xml index e8ba916f..05f746cd 100644 --- a/redback-configuration/src/test/resources/META-INF/spring-context.xml +++ b/redback-configuration/src/test/resources/META-INF/spring-context.xml @@ -27,7 +27,7 @@ default-lazy-init="true"> - + src/test/resources/props/test-another.properties diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java index a7548c3f..ae328db2 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java @@ -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; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java index 79a09b53..0c30a13d 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java @@ -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; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java index 08092a55..10b94128 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/VelocityMailGenerator.java @@ -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; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java index ef46ff42..56bfd936 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfConfiguredTag.java @@ -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; diff --git a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml index def35db0..6fb1a7ec 100644 --- a/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml +++ b/redback-integrations/redback-common-integrations/src/test/resources/spring-context.xml @@ -42,7 +42,7 @@ - + src/test/config/mail.properties diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java index 84562dc5..7272a529 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java @@ -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; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java index 9442c71d..26d4f615 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminServiceImpl.java @@ -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; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java index c37dbf88..4d1be692 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java @@ -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; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java index 75354bbf..6e009350 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java @@ -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; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java index 548b126e..f8eec637 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java @@ -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; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java index 8ca6adb4..ef245218 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java @@ -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; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml index 4228ff88..1ecf622c 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml @@ -77,7 +77,7 @@ - org.codehaus.plexus.redback.configuration.UserConfiguration + org.apache.archiva.redback.configuration.UserConfiguration userConf diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml index ca7b15a3..d0b8b024 100644 --- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml +++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml @@ -40,7 +40,7 @@ - + diff --git a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml index 4f9e407b..ba46dc01 100644 --- a/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml +++ b/redback-keys/redback-keys-providers/redback-keys-jdo/src/test/resources/spring-context.xml @@ -39,7 +39,7 @@ - + diff --git a/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java b/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java index 6a217ea0..628a5dd6 100644 --- a/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java +++ b/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java @@ -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. diff --git a/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java b/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java index 37077427..d93fc8b9 100644 --- a/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java +++ b/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java @@ -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; diff --git a/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java b/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java index d3bb5e7c..d3899fe0 100644 --- a/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java +++ b/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java @@ -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; diff --git a/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java b/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java index 6e1394a3..7ebeddcc 100644 --- a/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java +++ b/redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java @@ -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; diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml index b64319f7..8928117c 100755 --- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml @@ -41,7 +41,7 @@ - + diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml index 1881e883..8c256723 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/resources/spring-context.xml @@ -44,7 +44,7 @@ - + diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml index 25d371fc..f151879d 100755 --- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/resources/spring-context.xml @@ -40,7 +40,7 @@ - + diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml index 9bc14b88..da558f02 100644 --- a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml +++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml @@ -73,7 +73,7 @@ - + diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml index 2509c0f2..4c7a8d69 100755 --- a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml +++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml @@ -42,7 +42,7 @@ - + diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml index 4f9e407b..ba46dc01 100644 --- a/redback-system/src/test/resources/spring-context.xml +++ b/redback-system/src/test/resources/spring-context.xml @@ -39,7 +39,7 @@ - + diff --git a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java index eba794f0..f4d5cf40 100644 --- a/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java +++ b/redback-users/redback-users-providers/redback-users-configurable/src/main/java/org/apache/archiva/redback/users/configurable/ConfigurableUserManager.java @@ -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; diff --git a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml index 8acaa1d5..286bac98 100644 --- a/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml +++ b/redback-users/redback-users-providers/redback-users-jdo/src/test/resources/spring-context.xml @@ -34,7 +34,7 @@ - +