diff options
Diffstat (limited to 'redback-integrations')
11 files changed, 11 insertions, 11 deletions
diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java index ce9a5ee6c..fe154d27a 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/role/RoleConstants.java @@ -19,7 +19,7 @@ package org.codehaus.redback.integration.role; * under the License. */ -import org.codehaus.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; /** * RoleConstants: diff --git a/redback-integrations/redback-integrations-security/src/main/java/org/codehaus/redback/integration/security/role/RedbackRoleConstants.java b/redback-integrations/redback-integrations-security/src/main/java/org/apache/archiva/redback/integration/security/role/RedbackRoleConstants.java index 12842bd72..b7241b96f 100644 --- a/redback-integrations/redback-integrations-security/src/main/java/org/codehaus/redback/integration/security/role/RedbackRoleConstants.java +++ b/redback-integrations/redback-integrations-security/src/main/java/org/apache/archiva/redback/integration/security/role/RedbackRoleConstants.java @@ -1,4 +1,4 @@ -package org.codehaus.redback.integration.security.role; +package org.apache.archiva.redback.integration.security.role; /* * Licensed to the Apache Software Foundation (ASF) under one 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 4e181dd62..4a9c5471f 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 @@ -19,7 +19,7 @@ package org.codehaus.redback.rest.api.services; */ import org.apache.archiva.redback.authorization.RedbackAuthorization; -import org.codehaus.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.rest.api.model.Application; import org.codehaus.redback.rest.api.model.ApplicationRoles; import org.codehaus.redback.rest.api.model.Role; 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 872c307a7..b05768f20 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 @@ -20,7 +20,7 @@ package org.codehaus.redback.rest.api.services; */ import org.apache.archiva.redback.authorization.RedbackAuthorization; -import org.codehaus.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.rest.api.model.Operation; import org.codehaus.redback.rest.api.model.Permission; import org.codehaus.redback.rest.api.model.RegistrationKey; 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 581dc47f8..26c7d1388 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 @@ -33,7 +33,7 @@ import org.codehaus.plexus.redback.role.model.ModelApplication; import org.codehaus.plexus.redback.role.model.ModelRole; import org.codehaus.plexus.redback.role.model.ModelTemplate; import org.codehaus.redback.integration.model.AdminEditUserCredentials; -import org.codehaus.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.integration.util.RoleSorter; 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-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 ff0f8f84e..5c7b06605 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 @@ -44,7 +44,7 @@ import org.apache.archiva.redback.rbac.RbacObjectNotFoundException; 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; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.rest.api.model.ErrorMessage; 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-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java index b4862d574..ce2034759 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/AbstractRestServicesTest.java @@ -26,7 +26,7 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.transport.servlet.CXFServlet; import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.rest.api.model.User; import org.codehaus.redback.rest.api.services.LoginService; import org.codehaus.redback.rest.api.services.RoleManagementService; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java index a8dbece3b..436475743 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/codehaus/redback/rest/services/LoginServiceTest.java @@ -18,7 +18,7 @@ package org.codehaus.redback.rest.services; * under the License. */ -import org.codehaus.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.rest.api.model.User; import org.codehaus.redback.rest.api.services.UserService; import org.junit.Test; 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 1333aeff7..6b024075a 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 @@ -29,7 +29,7 @@ import org.apache.archiva.redback.rbac.RbacManagerException; 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; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.codehaus.redback.integration.util.RoleSorter; 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 dc27c0708..d721b64f9 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 @@ -31,7 +31,7 @@ import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionException; import org.codehaus.redback.integration.mail.Mailer; import org.codehaus.redback.integration.model.CreateUserCredentials; -import org.codehaus.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; 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/action/admin/EditRoleAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java index d1d81bfb1..409d70398 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java @@ -33,7 +33,7 @@ import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.plexus.util.StringUtils; import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; |