diff options
52 files changed, 86 insertions, 90 deletions
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/ExpectedJsps.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/ExpectedJsps.java index 3dc388a61..f26831745 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/ExpectedJsps.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/ExpectedJsps.java @@ -21,7 +21,7 @@ package org.codehaus.redback.integration.checks; import java.util.List; -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.system.check.EnvironmentCheck; import org.springframework.stereotype.Service; /** 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 f8ff763f8..65267bc51 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 @@ -28,9 +28,9 @@ import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.role.RoleManager; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.check.EnvironmentCheck; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.codehaus.plexus.util.IOUtil; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java index 1bd546480..284734074 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java @@ -24,8 +24,8 @@ import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.role.RoleManager; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.check.EnvironmentCheck; import org.apache.archiva.redback.users.UserManager; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java index f47e47421..15aa7ed14 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/LockedAdminEnvironmentCheck.java @@ -20,10 +20,10 @@ package org.codehaus.redback.integration.checks.security; */ import org.apache.archiva.redback.rbac.RbacManagerException; +import org.apache.archiva.redback.system.check.EnvironmentCheck; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.UserAssignment; -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.codehaus.redback.integration.role.RoleConstants; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java index b8792e70b..0fbd1eb9d 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java @@ -25,7 +25,7 @@ import javax.inject.Inject; import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManagerException; -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.system.check.EnvironmentCheck; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java index 5cab6e279..0453ad3a9 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java @@ -26,9 +26,9 @@ import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.policy.AccountLockedException; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.codehaus.plexus.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java index 642394963..42565b50a 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java @@ -31,7 +31,7 @@ import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.commons.codec.binary.Base64; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; -import org.codehaus.plexus.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySession; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java index 3c4c8eef8..64c5eefcf 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authorization/SimpleAuthorizationFilter.java @@ -20,8 +20,8 @@ package org.codehaus.redback.integration.filter.authorization; */ import org.apache.archiva.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.filter.SpringServletFilter; import org.slf4j.Logger; 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 7d1081b9d..2dd587a2d 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 @@ -37,7 +37,7 @@ import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserValidationSettings; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.plexus.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java index 4c7f5f345..3ebb74fd4 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvRolesMatrix.java @@ -24,7 +24,7 @@ import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.rbac.UserAssignment; import org.apache.archiva.redback.users.UserManager; import org.apache.commons.lang.StringEscapeUtils; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.User; import org.codehaus.redback.integration.util.RoleSorter; import org.codehaus.redback.integration.util.UserComparator; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java index a71313869..3ea2f52b8 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/reports/CsvUserList.java @@ -23,7 +23,7 @@ import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.StringEscapeUtils; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.redback.integration.util.UserComparator; 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/IfAnyAuthorizedTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java index 8f551f05e..688e1eb54 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAnyAuthorizedTag.java @@ -20,9 +20,9 @@ package org.codehaus.redback.integration.taglib.jsp; */ import org.apache.archiva.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.springframework.context.ApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java index a1a75eeea..670ffc84f 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/taglib/jsp/IfAuthorizedTag.java @@ -20,9 +20,9 @@ package org.codehaus.redback.integration.taglib.jsp; */ import org.apache.archiva.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.springframework.context.ApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java index 027222c2c..5ba995b90 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java @@ -29,7 +29,7 @@ import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.policy.CookieSettings; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.plexus.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java index 956bfba18..d6fe1cf48 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java @@ -28,8 +28,8 @@ import org.apache.archiva.redback.keys.AuthenticationKey; import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey; import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey; import org.apache.archiva.redback.keys.memory.MemoryKeyManager; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.rest.api.model.User; import org.codehaus.redback.rest.api.services.LoginService; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java index 10b13efa9..71b3a3195 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java @@ -25,7 +25,7 @@ import org.apache.archiva.redback.users.User; import org.apache.commons.lang.StringUtils; import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManagerException; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.rest.api.model.ErrorMessage; 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 19da990e9..ff0f8f84e 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 @@ -41,7 +41,7 @@ import org.apache.archiva.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RbacObjectNotFoundException; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.mail.Mailer; import org.codehaus.redback.integration.security.role.RedbackRoleConstants; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java index cd11c7897..0a915b201 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java @@ -30,7 +30,7 @@ import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.policy.AccountLockedException; -import org.codehaus.plexus.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException; import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java index 99092f9a3..20421504c 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java @@ -26,8 +26,8 @@ import org.apache.cxf.message.Message; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.RedbackAuthorization; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/EnvironmentChecker.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/EnvironmentChecker.java index 3aeebd02f..f3ad73462 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/EnvironmentChecker.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/EnvironmentChecker.java @@ -18,7 +18,7 @@ package org.codehaus.redback.rest.services.utils; * under the License. */ -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.system.check.EnvironmentCheck; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/PasswordValidator.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/PasswordValidator.java index 2bb8bfa39..eec71efdb 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/PasswordValidator.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/PasswordValidator.java @@ -23,7 +23,7 @@ import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordRuleViolationException; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.redback.rest.api.model.ErrorMessage; import org.codehaus.redback.rest.api.services.RedbackServiceException; import org.slf4j.Logger; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java index e19361e9f..b57af4c96 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java @@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRequest; import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.policy.PasswordRuleViolationException; import org.apache.archiva.redback.policy.PasswordRuleViolations; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.codehaus.redback.integration.interceptor.SecureAction; import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java index bc7476fa9..1333aeff7 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java @@ -26,7 +26,7 @@ import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.policy.PasswordRuleViolationException; import org.apache.archiva.redback.rbac.RbacManagerException; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.model.UserCredentials; import org.codehaus.redback.integration.security.role.RedbackRoleConstants; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java index 73bd75a4c..8954eca70 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java @@ -23,9 +23,9 @@ import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordRuleViolationException; -import org.codehaus.plexus.redback.system.DefaultSecuritySession; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.DefaultSecuritySession; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.UserManager; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.interceptor.SecureActionBundle; 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 53014866d..9bf8558cb 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 @@ -33,8 +33,8 @@ import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.policy.MustChangePasswordException; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.interceptor.SecureActionBundle; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java index 58cef9213..3f7014cf8 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java @@ -23,8 +23,8 @@ import org.apache.archiva.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.policy.PasswordRuleViolationException; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.interceptor.SecureActionBundle; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java index 81515707b..6cef8a840 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java @@ -25,7 +25,7 @@ import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManagerException; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.User; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.interceptor.SecureActionBundle; 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 a8c0d4d6c..534bf57c2 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 @@ -32,7 +32,7 @@ import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.struts2.action.AuditEvent; -import org.codehaus.plexus.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.redback.integration.interceptor.SecureActionBundle; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java index c5392e1e7..a93208cc9 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java @@ -25,7 +25,7 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.plexus.registry.Registry; import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java index b848329b1..107e448e8 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java @@ -30,9 +30,9 @@ import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.Role; import org.codehaus.plexus.redback.struts2.action.AuditEvent; import org.codehaus.plexus.redback.struts2.action.CancellableAction; -import org.codehaus.plexus.redback.system.DefaultSecuritySession; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.DefaultSecuritySession; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.UserManager; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.interceptor.SecureActionBundle; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java index 388b57c3e..873c07010 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java @@ -29,7 +29,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.rbac.RBACManager; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserQuery; import org.codehaus.plexus.util.StringUtils; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkActions.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkActions.java index e1d142a2c..89a218bf5 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkActions.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkActions.java @@ -21,7 +21,7 @@ package org.codehaus.plexus.redback.struts2.checks; import java.util.List; -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.system.check.EnvironmentCheck; /** * ExpectedXworkActions diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java index 61320fab3..ccb94e7f7 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java @@ -22,7 +22,7 @@ package org.codehaus.plexus.redback.struts2.checks; import java.util.ArrayList; import java.util.List; -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.system.check.EnvironmentCheck; import org.codehaus.redback.integration.checks.xwork.XworkPackageConfig; import com.opensymphony.xwork2.config.Configuration; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java index e8c98d2a3..400faab83 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java @@ -29,9 +29,9 @@ import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.redback.integration.util.AutoLoginCookies; import org.slf4j.Logger; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/EnvironmentCheckInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/EnvironmentCheckInterceptor.java index e2f6e742f..040a157dd 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/EnvironmentCheckInterceptor.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/EnvironmentCheckInterceptor.java @@ -21,10 +21,9 @@ package org.codehaus.plexus.redback.struts2.interceptor; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; -import org.codehaus.plexus.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.system.check.EnvironmentCheck; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; 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 effacde86..b26b7f37c 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 @@ -29,9 +29,9 @@ import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationData import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManagerException; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.UserManager; import org.codehaus.redback.integration.checks.security.AdminAutoCreateCheck; import org.codehaus.redback.integration.util.AutoLoginCookies; 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 2f516b62c..e3158d50f 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 @@ -29,10 +29,10 @@ import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.users.UserManager; import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.policy.UserSecurityPolicy; -import org.codehaus.plexus.redback.system.DefaultSecuritySession; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.DefaultSecuritySession; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java index 7fb6c6c82..c72b88f36 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java @@ -27,9 +27,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.SystemUtils; import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.authorization.AuthorizationResult; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.codehaus.redback.integration.interceptor.SecureAction; import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java index 6aa2d5439..13b140561 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java @@ -36,9 +36,9 @@ import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.policy.AccountLockedException; -import org.codehaus.plexus.redback.system.DefaultSecuritySession; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.DefaultSecuritySession; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.XWorkTestCase; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java index 53dce55af..4fd401d99 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java @@ -32,9 +32,9 @@ import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationData import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.UserAssignment; import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystem; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.memory.SimpleUser; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java index ff8d8f930..2c216446f 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java @@ -30,9 +30,9 @@ import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.rbac.RbacObjectNotFoundException; -import org.codehaus.plexus.redback.system.DefaultSecuritySession; -import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.system.SecuritySystemConstants; +import org.apache.archiva.redback.system.DefaultSecuritySession; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.memory.SimpleUser; import org.codehaus.redback.integration.model.AdminEditUserCredentials; import org.junit.After; diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySession.java b/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySession.java index 1f6257de1..2fc40c2fd 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySession.java +++ b/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySession.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system; +package org.apache.archiva.redback.system; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java b/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java index 1299f6540..269ce6de5 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java +++ b/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system; +package org.apache.archiva.redback.system; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySession.java b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySession.java index 8ac071a58..24a58e908 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySession.java +++ b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySession.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system; +package org.apache.archiva.redback.system; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystem.java index 86ad563d4..9a2c269da 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java +++ b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystem.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system; +package org.apache.archiva.redback.system; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystemConstants.java b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java index fc169dff1..ca8bfd49d 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystemConstants.java +++ b/redback-system/src/main/java/org/apache/archiva/redback/system/SecuritySystemConstants.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system; +package org.apache.archiva.redback.system; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/check/EnvironmentCheck.java b/redback-system/src/main/java/org/apache/archiva/redback/system/check/EnvironmentCheck.java index aca3c6053..b8872aa72 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/check/EnvironmentCheck.java +++ b/redback-system/src/main/java/org/apache/archiva/redback/system/check/EnvironmentCheck.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system.check; +package org.apache.archiva.redback.system.check; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/main/resources/META-INF/spring-context.xml b/redback-system/src/main/resources/META-INF/spring-context.xml index 44f80402a..46746c37d 100644 --- a/redback-system/src/main/resources/META-INF/spring-context.xml +++ b/redback-system/src/main/resources/META-INF/spring-context.xml @@ -28,6 +28,6 @@ default-lazy-init="true"> <context:annotation-config /> - <context:component-scan base-package="org.codehaus.plexus.redback.system"/> + <context:component-scan base-package="org.apache.archiva.redback.system"/> </beans>
\ No newline at end of file diff --git a/redback-system/src/test/java/org/codehaus/plexus/redback/system/DefaultSecureApplication.java b/redback-system/src/test/java/org/apache/archiva/redback/system/DefaultSecureApplication.java index 33f85d8df..668d0b828 100644 --- a/redback-system/src/test/java/org/codehaus/plexus/redback/system/DefaultSecureApplication.java +++ b/redback-system/src/test/java/org/apache/archiva/redback/system/DefaultSecureApplication.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system; +package org.apache.archiva.redback.system; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/test/java/org/codehaus/plexus/redback/system/SecureApplication.java b/redback-system/src/test/java/org/apache/archiva/redback/system/SecureApplication.java index 89f38ea66..fb796d617 100644 --- a/redback-system/src/test/java/org/codehaus/plexus/redback/system/SecureApplication.java +++ b/redback-system/src/test/java/org/apache/archiva/redback/system/SecureApplication.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system; +package org.apache.archiva.redback.system; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/test/java/org/codehaus/plexus/redback/system/TestAuthenticationManager.java b/redback-system/src/test/java/org/apache/archiva/redback/system/TestAuthenticationManager.java index 73a3d8f26..78d9b9296 100644 --- a/redback-system/src/test/java/org/codehaus/plexus/redback/system/TestAuthenticationManager.java +++ b/redback-system/src/test/java/org/apache/archiva/redback/system/TestAuthenticationManager.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.system; +package org.apache.archiva.redback.system; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml index ba46dc01b..9c6d7f55d 100644 --- a/redback-system/src/test/resources/spring-context.xml +++ b/redback-system/src/test/resources/spring-context.xml @@ -20,11 +20,8 @@ --> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> <bean name="jdoFactory#users" class="org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory"> <property name="driverName" value="org.hsqldb.jdbcDriver"/> |