From 9494bac7faa06d74a7b4721a69824da86e5abbea Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 7 Apr 2012 20:50:23 +0000 Subject: [PATCH] package move to o.a.a.r module redback-authorization-api git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310861 13f79535-47bb-0310-9956-ffa450edef68 --- .../redback/authorization/AuthorizationDataSource.java | 2 +- .../redback/authorization/AuthorizationException.java | 2 +- .../redback/authorization/AuthorizationResult.java | 2 +- .../archiva}/redback/authorization/Authorizer.java | 7 +++++-- .../redback/authorization/NotAuthorizedException.java | 2 +- .../redback/authorization/RedbackAuthorization.java | 2 +- .../redback/authorization/UnauthorizedException.java | 2 +- .../redback/authorization/open/OpenAuthorizer.java | 8 ++++---- .../authorization/SimpleAuthorizationFilter.java | 2 +- .../integration/taglib/jsp/IfAnyAuthorizedTag.java | 2 +- .../integration/taglib/jsp/IfAuthorizedTag.java | 2 +- .../redback/rest/api/services/LoginService.java | 3 +-- .../redback/rest/api/services/PasswordService.java | 2 +- .../rest/api/services/RoleManagementService.java | 2 +- .../redback/rest/api/services/UserService.java | 2 +- .../redback/rest/api/services/UtilServices.java | 2 +- .../services/interceptors/AbstractInterceptor.java | 2 +- .../interceptors/AuthenticationInterceptor.java | 2 +- .../services/interceptors/PermissionsInterceptor.java | 4 ++-- .../redback/rest/services/FakeCreateAdminService.java | 2 +- .../struts2/interceptor/SecureActionInterceptor.java | 2 +- .../struts2/action/admin/AssignmentsActionTest.java | 2 +- .../redback/authorization/rbac/RbacAuthorizer.java | 10 +++++----- .../plexus/redback/rbac/memory/MemoryAuthorizer.java | 8 ++++---- .../plexus/redback/system/DefaultSecuritySystem.java | 8 ++++---- .../codehaus/plexus/redback/system/SecuritySystem.java | 4 ++-- 26 files changed, 45 insertions(+), 43 deletions(-) rename redback-authorization/redback-authorization-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/AuthorizationDataSource.java (97%) rename redback-authorization/redback-authorization-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/AuthorizationException.java (96%) rename redback-authorization/redback-authorization-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/AuthorizationResult.java (96%) rename redback-authorization/redback-authorization-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/Authorizer.java (80%) rename redback-authorization/redback-authorization-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/NotAuthorizedException.java (96%) rename redback-authorization/redback-authorization-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/RedbackAuthorization.java (97%) rename redback-authorization/redback-authorization-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authorization/UnauthorizedException.java (95%) diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationDataSource.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationDataSource.java similarity index 97% rename from redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationDataSource.java rename to redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationDataSource.java index 57a82c6e..73721f72 100644 --- a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationDataSource.java +++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationDataSource.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization; +package org.apache.archiva.redback.authorization; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationException.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java similarity index 96% rename from redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationException.java rename to redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java index d27b272b..b04acb88 100644 --- a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationException.java +++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization; +package org.apache.archiva.redback.authorization; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationResult.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java similarity index 96% rename from redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationResult.java rename to redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java index 8c3c7f06..fbdb41a9 100644 --- a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/AuthorizationResult.java +++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/AuthorizationResult.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization; +package org.apache.archiva.redback.authorization; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/Authorizer.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java similarity index 80% rename from redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/Authorizer.java rename to redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java index 52b26ae3..0b3051f7 100644 --- a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/Authorizer.java +++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/Authorizer.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization; +package org.apache.archiva.redback.authorization; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,11 +19,14 @@ package org.codehaus.plexus.redback.authorization; * under the License. */ +import org.apache.archiva.redback.authorization.AuthorizationDataSource; +import org.apache.archiva.redback.authorization.AuthorizationException; +import org.apache.archiva.redback.authorization.AuthorizationResult; + /** * Authorizer: * * @author: Jesse McConnell - * @version: $ID:$ * @todo chain of command rule processing */ public interface Authorizer diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/NotAuthorizedException.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java similarity index 96% rename from redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/NotAuthorizedException.java rename to redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java index fd41ad17..e4a99745 100644 --- a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/NotAuthorizedException.java +++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/NotAuthorizedException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization; +package org.apache.archiva.redback.authorization; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/RedbackAuthorization.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/RedbackAuthorization.java similarity index 97% rename from redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/RedbackAuthorization.java rename to redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/RedbackAuthorization.java index 09e53526..c680f0fb 100644 --- a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/RedbackAuthorization.java +++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/RedbackAuthorization.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization; +package org.apache.archiva.redback.authorization; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/UnauthorizedException.java b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/UnauthorizedException.java similarity index 95% rename from redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/UnauthorizedException.java rename to redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/UnauthorizedException.java index 93797f96..fab7e702 100755 --- a/redback-authorization/redback-authorization-api/src/main/java/org/codehaus/plexus/redback/authorization/UnauthorizedException.java +++ b/redback-authorization/redback-authorization-api/src/main/java/org/apache/archiva/redback/authorization/UnauthorizedException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authorization; +package org.apache.archiva.redback.authorization; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java b/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java index b6e56628..2a54c226 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java +++ b/redback-authorization/redback-authorization-providers/redback-authorization-open/src/main/java/org/codehaus/plexus/redback/authorization/open/OpenAuthorizer.java @@ -16,10 +16,10 @@ package org.codehaus.plexus.redback.authorization.open; * limitations under the License. */ -import org.codehaus.plexus.redback.authorization.AuthorizationDataSource; -import org.codehaus.plexus.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.authorization.AuthorizationResult; -import org.codehaus.plexus.redback.authorization.Authorizer; +import org.apache.archiva.redback.authorization.AuthorizationDataSource; +import org.apache.archiva.redback.authorization.AuthorizationException; +import org.apache.archiva.redback.authorization.AuthorizationResult; +import org.apache.archiva.redback.authorization.Authorizer; 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 ef242af9..3c4c8eef 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 @@ -19,7 +19,7 @@ package org.codehaus.redback.integration.filter.authorization; * under the License. */ -import org.codehaus.plexus.redback.authorization.AuthorizationException; +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.util.StringUtils; 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 a2550263..8f551f05 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 @@ -19,7 +19,7 @@ package org.codehaus.redback.integration.taglib.jsp; * under the License. */ -import org.codehaus.plexus.redback.authorization.AuthorizationException; +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; 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 213784f3..a1a75eee 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 @@ -19,7 +19,7 @@ package org.codehaus.redback.integration.taglib.jsp; * under the License. */ -import org.codehaus.plexus.redback.authorization.AuthorizationException; +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; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java index bbe6a5c5..6b488c10 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/LoginService.java @@ -19,8 +19,7 @@ package org.codehaus.redback.rest.api.services; * under the License. */ -import org.apache.cxf.jaxrs.model.wadl.Description; -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.codehaus.redback.rest.api.model.User; import javax.ws.rs.GET; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java index 345ac72f..4e92eb36 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/PasswordService.java @@ -18,7 +18,7 @@ package org.codehaus.redback.rest.api.services; * under the License. */ -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.codehaus.redback.rest.api.model.User; import javax.ws.rs.GET; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java index 8849ad47..4e181dd6 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/RoleManagementService.java @@ -18,7 +18,7 @@ package org.codehaus.redback.rest.api.services; * under the License. */ -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.codehaus.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.rest.api.model.Application; import org.codehaus.redback.rest.api.model.ApplicationRoles; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java index c2bbdf9c..872c307a 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UserService.java @@ -19,7 +19,7 @@ package org.codehaus.redback.rest.api.services; * under the License. */ -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.codehaus.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.rest.api.model.Operation; import org.codehaus.redback.rest.api.model.Permission; diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java index 7d4a04a2..22936e13 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/codehaus/redback/rest/api/services/UtilServices.java @@ -18,7 +18,7 @@ package org.codehaus.redback.rest.api.services; * under the License. */ -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +import org.apache.archiva.redback.authorization.RedbackAuthorization; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java index a4bb9736..9801ad6d 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AbstractInterceptor.java @@ -21,7 +21,7 @@ package org.codehaus.redback.rest.services.interceptors; import org.apache.cxf.jaxrs.model.OperationResourceInfo; import org.apache.cxf.message.Message; -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +import org.apache.archiva.redback.authorization.RedbackAuthorization; 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/interceptors/AuthenticationInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java index df91c39f..1f4c1e27 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 @@ -27,7 +27,7 @@ import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.system.SecuritySession; 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 86514bf6..99092f9a 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 @@ -24,8 +24,8 @@ import org.apache.cxf.jaxrs.ext.RequestHandler; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; import org.apache.archiva.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +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.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java index 1ebd45a7..cd6312b2 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/FakeCreateAdminService.java @@ -18,7 +18,7 @@ package org.codehaus.redback.rest.services; * under the License. */ -import org.codehaus.plexus.redback.authorization.RedbackAuthorization; +import org.apache.archiva.redback.authorization.RedbackAuthorization; import javax.ws.rs.GET; import javax.ws.rs.Path; 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 55dcc761..7fb6c6c8 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 @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.ActionInvocation; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.SystemUtils; import org.apache.struts2.ServletActionContext; -import org.codehaus.plexus.redback.authorization.AuthorizationResult; +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; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java index 4df377ef..9bdc2e31 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java @@ -24,7 +24,7 @@ import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionProxy; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authorization.AuthorizationResult; +import org.apache.archiva.redback.authorization.AuthorizationResult; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.rbac.RbacManagerException; diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java index 03153803..ebf18202 100644 --- a/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java +++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/codehaus/plexus/redback/authorization/rbac/RbacAuthorizer.java @@ -20,11 +20,11 @@ package org.codehaus.plexus.redback.authorization.rbac; */ import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authorization.AuthorizationDataSource; -import org.codehaus.plexus.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.authorization.AuthorizationResult; -import org.codehaus.plexus.redback.authorization.Authorizer; -import org.codehaus.plexus.redback.authorization.NotAuthorizedException; +import org.apache.archiva.redback.authorization.AuthorizationDataSource; +import org.apache.archiva.redback.authorization.AuthorizationException; +import org.apache.archiva.redback.authorization.AuthorizationResult; +import org.apache.archiva.redback.authorization.Authorizer; +import org.apache.archiva.redback.authorization.NotAuthorizedException; import org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluationException; import org.codehaus.plexus.redback.authorization.rbac.evaluator.PermissionEvaluator; import org.codehaus.plexus.redback.rbac.Permission; diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java index 15461aee..17dd4936 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/codehaus/plexus/redback/rbac/memory/MemoryAuthorizer.java @@ -19,10 +19,10 @@ package org.codehaus.plexus.redback.rbac.memory; * under the License. */ -import org.codehaus.plexus.redback.authorization.AuthorizationDataSource; -import org.codehaus.plexus.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.authorization.AuthorizationResult; -import org.codehaus.plexus.redback.authorization.Authorizer; +import org.apache.archiva.redback.authorization.AuthorizationDataSource; +import org.apache.archiva.redback.authorization.AuthorizationException; +import org.apache.archiva.redback.authorization.AuthorizationResult; +import org.apache.archiva.redback.authorization.Authorizer; import org.springframework.stereotype.Service; /** diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java b/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java index 53509b55..862c66f0 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java +++ b/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java @@ -26,10 +26,10 @@ import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationManager; import org.apache.archiva.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authorization.AuthorizationDataSource; -import org.codehaus.plexus.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.authorization.AuthorizationResult; -import org.codehaus.plexus.redback.authorization.Authorizer; +import org.apache.archiva.redback.authorization.AuthorizationDataSource; +import org.apache.archiva.redback.authorization.AuthorizationException; +import org.apache.archiva.redback.authorization.AuthorizationResult; +import org.apache.archiva.redback.authorization.Authorizer; import org.codehaus.plexus.redback.keys.KeyManager; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java b/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java index b288f8a6..13c5b4ce 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java +++ b/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java @@ -22,8 +22,8 @@ package org.codehaus.plexus.redback.system; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authorization.AuthorizationException; -import org.codehaus.plexus.redback.authorization.AuthorizationResult; +import org.apache.archiva.redback.authorization.AuthorizationException; +import org.apache.archiva.redback.authorization.AuthorizationResult; import org.codehaus.plexus.redback.keys.KeyManager; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException;