diff options
Diffstat (limited to 'redback-integrations')
12 files changed, 20 insertions, 22 deletions
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 00a8c1d31..f8ff763f8 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 @@ -20,14 +20,14 @@ package org.codehaus.redback.integration.checks.security; */ import org.apache.archiva.redback.rbac.RBACManager; +import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.lang.StringUtils; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.Role; -import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.role.RoleManagerException; +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; 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 e3c7e3114..1bd546480 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 @@ -20,10 +20,10 @@ package org.codehaus.redback.integration.checks.security; */ import org.apache.archiva.redback.policy.UserSecurityPolicy; +import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.role.RoleManagerException; +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.users.UserManager; 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 0dfef1341..b8792e70b 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 @@ -21,12 +21,10 @@ package org.codehaus.redback.integration.checks.security; import java.util.List; -import javax.annotation.Resource; import javax.inject.Inject; -import javax.inject.Named; -import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.role.RoleManagerException; +import org.apache.archiva.redback.role.RoleManager; +import org.apache.archiva.redback.role.RoleManagerException; import org.codehaus.plexus.redback.system.check.EnvironmentCheck; 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/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java index 82050aa17..581dc47f8 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultRoleManagementService.java @@ -23,12 +23,12 @@ import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.UserAssignment; +import org.apache.archiva.redback.role.RoleManager; +import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.lang.StringUtils; -import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.role.RoleManagerException; import org.codehaus.plexus.redback.role.model.ModelApplication; import org.codehaus.plexus.redback.role.model.ModelRole; import org.codehaus.plexus.redback.role.model.ModelTemplate; 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 5d6c8de2d..19da990e9 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 @@ -26,6 +26,8 @@ import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.UserAssignment; +import org.apache.archiva.redback.role.RoleManager; +import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.lang.StringUtils; @@ -39,8 +41,6 @@ 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.role.RoleManager; -import org.codehaus.plexus.redback.role.RoleManagerException; import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.mail.Mailer; 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 881ce83a1..460b351c9 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 @@ -22,7 +22,7 @@ package org.codehaus.redback.rest.services; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.configuration.UserConfiguration; -import org.codehaus.plexus.redback.role.RoleManager; +import org.apache.archiva.redback.role.RoleManager; import org.codehaus.redback.rest.api.services.UserService; import javax.inject.Inject; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java index 9ec50a4a5..dc27c0708 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java @@ -21,10 +21,10 @@ package org.codehaus.plexus.redback.struts2.action; import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.policy.UserSecurityPolicy; +import org.apache.archiva.redback.role.RoleManager; +import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.keys.KeyManagerException; -import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.role.RoleManagerException; import org.apache.archiva.redback.users.UserManager; 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/AddAdminUserAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java index 249b9177b..a8c0d4d6c 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 @@ -22,6 +22,8 @@ package org.codehaus.plexus.redback.struts2.action.admin; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.policy.MustChangePasswordException; +import org.apache.archiva.redback.role.RoleManager; +import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.users.UserManager; import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.authentication.AuthenticationConstants; @@ -29,8 +31,6 @@ import org.apache.archiva.redback.authentication.AuthenticationDataSource; 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.role.RoleManager; -import org.codehaus.plexus.redback.role.RoleManagerException; import org.codehaus.plexus.redback.struts2.action.AuditEvent; import org.codehaus.plexus.redback.system.SecuritySession; import org.apache.archiva.redback.users.User; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java index 47f0e6cd1..6731f2f56 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java @@ -22,10 +22,10 @@ package org.codehaus.plexus.redback.struts2.action.admin; import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.rbac.UserAssignment; +import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.rbac.RbacManagerException; -import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.model.ModelApplication; import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction; import org.codehaus.plexus.redback.struts2.action.AuditEvent; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java index 27fd637fe..9db8eb264 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java @@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.struts2.action.admin; */ import org.apache.archiva.redback.rbac.Resource; -import org.codehaus.plexus.redback.role.RoleManager; +import org.apache.archiva.redback.role.RoleManager; import org.codehaus.plexus.redback.role.model.RedbackRoleModel; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; 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/interceptor/ForceAdminUserInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java index f8eec6377..effacde86 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 @@ -27,8 +27,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.configuration.UserConfiguration; -import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.role.RoleManagerException; +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; 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 82593600f..53dce55af 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 @@ -24,13 +24,13 @@ import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RbacObjectInvalidException; +import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.users.UserManager; import org.apache.struts2.StrutsSpringTestCase; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.UserAssignment; -import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction; import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySystem; |