From 6a0d821567c0ea92b656ae03200a12e4d8f0b316 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 8 Apr 2012 16:23:02 +0000 Subject: [PATCH] move to package o.a.a.r redback module redback-common-integrations git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1311036 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/archiva/web/rss/RssFeedServlet.java | 2 +- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../apache/archiva/web/action/admin/SchedulerAction.java | 6 +++--- .../apache/archiva/web/action/admin/SystemStatusAction.java | 6 +++--- .../action/admin/appearance/EditOrganisationInfoAction.java | 6 +++--- .../connectors/proxy/AbstractProxyConnectorAction.java | 6 +++--- .../web/action/admin/legacy/LegacyArtifactPathAction.java | 6 +++--- .../action/admin/network/NetworkConfigurationAction.java | 6 +++--- .../admin/networkproxies/ConfigureNetworkProxyAction.java | 6 +++--- .../action/admin/networkproxies/NetworkProxiesAction.java | 6 +++--- .../admin/repositories/AbstractRepositoriesAdminAction.java | 6 +++--- .../web/action/admin/repositories/RepositoriesAction.java | 6 +++--- .../web/action/admin/scanning/RepositoryScanningAction.java | 6 +++--- .../archiva/web/action/reports/GenerateReportAction.java | 6 +++--- .../web/action/reports/ViewAuditLogReportAction.java | 6 +++--- .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../admin/connectors/proxy/AddProxyConnectorActionTest.java | 2 +- .../connectors/proxy/DeleteProxyConnectorActionTest.java | 2 +- .../connectors/proxy/DisableProxyConnectorActionTest.java | 2 +- .../connectors/proxy/EditProxyConnectorActionTest.java | 2 +- .../connectors/proxy/EnableProxyConnectorActionTest.java | 2 +- .../admin/connectors/proxy/ProxyConnectorsActionTest.java | 2 +- .../connectors/proxy/SortProxyConnectorsActionTest.java | 2 +- .../admin/repositories/AddManagedRepositoryActionTest.java | 4 ++-- .../admin/repositories/AddRemoteRepositoryActionTest.java | 2 +- .../repositories/DeleteManagedRepositoryActionTest.java | 4 ++-- .../admin/repositories/DeleteRepositoryGroupActionTest.java | 4 ++-- .../admin/repositories/EditManagedRepositoryActionTest.java | 4 ++-- .../admin/repositories/EditRemoteRepositoryActionTest.java | 4 ++-- .../action/admin/repositories/RepositoriesActionTest.java | 4 ++-- .../admin/repositories/RepositoryGroupsActionTest.java | 4 ++-- .../admin/repositories/SortRepositoriesActionTest.java | 4 ++-- .../apache/archiva/webdav/ArchivaDavResourceFactory.java | 2 +- .../apache/archiva/webdav/ArchivaDavSessionProvider.java | 2 +- .../java/org/apache/archiva/webdav/RepositoryServlet.java | 2 +- .../archiva/webdav/ArchivaDavSessionProviderTest.java | 2 +- .../archiva/webdav/RepositoryServletSecurityTest.java | 4 ++-- 37 files changed, 72 insertions(+), 72 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java index a89232420..d49097a11 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java @@ -44,7 +44,7 @@ import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.system.SecuritySession; -import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.context.WebApplicationContext; diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml index a1fd6d4ae..4afe2b91b 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml @@ -155,7 +155,7 @@ org.apache.archiva.redback.system.check.EnvironmentCheck locked-admin-check - org.codehaus.redback.integration.checks.security.LockedAdminEnvironmentCheck + org.apache.archiva.redback.integration.checks.security.LockedAdminEnvironmentCheck LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked and unlocks them on startup. diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SchedulerAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SchedulerAction.java index 383e7f99f..52a486f0d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SchedulerAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SchedulerAction.java @@ -26,9 +26,9 @@ import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.commons.lang.StringUtils; import org.apache.archiva.web.action.AbstractActionSupport; import org.codehaus.plexus.taskqueue.TaskQueueException; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java index b5f60bbae..2b78671d0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/SystemStatusAction.java @@ -26,9 +26,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.archiva.web.action.AbstractActionSupport; import org.codehaus.plexus.cache.Cache; import org.codehaus.plexus.taskqueue.TaskQueue; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java index b9708807e..162f9f1e0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java @@ -25,9 +25,9 @@ import org.apache.archiva.admin.model.beans.OrganisationInformation; import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.commons.lang.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java index fa85afc79..8c6d31c01 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java @@ -28,9 +28,9 @@ import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.commons.lang.StringUtils; import org.apache.archiva.web.action.AbstractActionSupport; import org.apache.archiva.redback.rbac.Resource; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import javax.inject.Inject; import java.util.List; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java index e4d1a496e..cfb095a1d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java @@ -28,9 +28,9 @@ import org.apache.archiva.web.util.ContextUtils; import org.apache.archiva.web.action.AbstractActionSupport; import org.apache.struts2.interceptor.ServletRequestAware; import org.apache.archiva.redback.rbac.Resource; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/network/NetworkConfigurationAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/network/NetworkConfigurationAction.java index 6ee155a27..1c484aa55 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/network/NetworkConfigurationAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/network/NetworkConfigurationAction.java @@ -25,9 +25,9 @@ import org.apache.archiva.admin.model.beans.NetworkConfiguration; import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.web.action.AbstractActionSupport; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java index 255d34581..f8ef4dc67 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java @@ -28,9 +28,9 @@ import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.commons.lang.StringUtils; import org.apache.archiva.web.action.AbstractActionSupport; import org.apache.archiva.redback.rbac.Resource; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java index b2aebc87d..f06e8ce44 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java @@ -25,9 +25,9 @@ import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.web.action.AbstractActionSupport; import org.apache.archiva.redback.rbac.Resource; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java index 300c0c920..94337c088 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java @@ -25,9 +25,9 @@ import org.apache.archiva.audit.Auditable; import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.web.action.AbstractActionSupport; import org.apache.archiva.redback.rbac.Resource; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import javax.inject.Inject; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoriesAction.java index a17e625b5..46c991604 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoriesAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/repositories/RepositoriesAction.java @@ -37,9 +37,9 @@ import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.web.util.ContextUtils; import org.apache.archiva.web.action.AbstractActionSupport; import org.apache.struts2.interceptor.ServletRequestAware; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java index bd3abca64..a48aa2172 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/scanning/RepositoryScanningAction.java @@ -35,9 +35,9 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.archiva.web.action.AbstractActionSupport; import org.apache.archiva.redback.rbac.Resource; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/reports/GenerateReportAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/reports/GenerateReportAction.java index 79602b8a1..07600cd6e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/reports/GenerateReportAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/reports/GenerateReportAction.java @@ -34,9 +34,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; import org.apache.archiva.web.action.AbstractRepositoryBasedAction; import org.apache.archiva.redback.rbac.Resource; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/reports/ViewAuditLogReportAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/reports/ViewAuditLogReportAction.java index e598a6952..fdf4e9f7f 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/reports/ViewAuditLogReportAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/reports/ViewAuditLogReportAction.java @@ -31,9 +31,9 @@ import org.apache.archiva.security.PrincipalNotFoundException; import org.apache.archiva.security.UserRepositories; import org.apache.archiva.web.action.AbstractActionSupport; import org.apache.struts2.interceptor.ServletRequestAware; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml index 01fe29a7e..85a638869 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -176,7 +176,7 @@ org.apache.archiva.redback.system.check.EnvironmentCheck locked-admin-check - org.codehaus.redback.integration.checks.security.LockedAdminEnvironmentCheck + org.apache.archiva.redback.integration.checks.security.LockedAdminEnvironmentCheck LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked and unlocks them on startup. diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java index 824779b1a..4de894046 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorActionTest.java @@ -38,7 +38,7 @@ import org.apache.archiva.policies.ReleasesPolicy; import org.apache.archiva.policies.SnapshotsPolicy; import org.apache.archiva.web.action.AbstractWebworkTestCase; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.easymock.MockControl; import java.util.List; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java index f052b26eb..4ec1d1317 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorActionTest.java @@ -31,7 +31,7 @@ import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.archiva.web.action.AbstractWebworkTestCase; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.easymock.MockControl; /** diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java index 9ae202255..e83c367f9 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorActionTest.java @@ -29,7 +29,7 @@ import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.archiva.web.action.AbstractWebworkTestCase; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.easymock.MockControl; public class DisableProxyConnectorActionTest diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java index 23c18cc27..e0e15b2b6 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EditProxyConnectorActionTest.java @@ -38,7 +38,7 @@ import org.apache.archiva.policies.ReleasesPolicy; import org.apache.archiva.policies.SnapshotsPolicy; import org.apache.archiva.web.action.AbstractWebworkTestCase; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.easymock.MockControl; import java.util.List; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java index 5c4255685..b7145500f 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorActionTest.java @@ -29,7 +29,7 @@ import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.archiva.web.action.AbstractWebworkTestCase; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.easymock.MockControl; public class EnableProxyConnectorActionTest diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java index b4f4939ed..4a838e342 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/ProxyConnectorsActionTest.java @@ -31,7 +31,7 @@ import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.archiva.web.action.AbstractWebworkTestCase; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.easymock.MockControl; /** diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java index 462c8d2e6..83f025b3d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsActionTest.java @@ -33,7 +33,7 @@ import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator; import org.apache.archiva.web.action.AbstractWebworkTestCase; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.easymock.MockControl; import java.util.Collections; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java index a69b9e5f2..32c2859f5 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java @@ -32,8 +32,8 @@ import org.apache.archiva.security.common.ArchivaRoleConstants; import org.apache.archiva.web.validator.utils.ValidatorUtil; import org.apache.commons.io.FileUtils; import org.codehaus.plexus.registry.Registry; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; import org.easymock.classextension.MockClassControl; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java index ff2f07bc2..65e6c0002 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/AddRemoteRepositoryActionTest.java @@ -25,7 +25,7 @@ import org.apache.archiva.admin.repository.remote.DefaultRemoteRepositoryAdmin; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.web.action.AbstractActionTestCase; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; import org.easymock.MockControl; import java.util.Collections; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java index 3d1090b1e..c20600140 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteManagedRepositoryActionTest.java @@ -44,8 +44,8 @@ import org.apache.archiva.web.action.AuditEventArgumentsMatcher; import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManagerException; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; import java.io.File; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java index cce27b900..74976d5e5 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/DeleteRepositoryGroupActionTest.java @@ -27,8 +27,8 @@ import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.RepositoryGroupConfiguration; import org.apache.archiva.web.action.AbstractActionTestCase; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; import java.util.Collections; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java index 7ed3f8095..bad7276bb 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java @@ -39,8 +39,8 @@ import org.apache.archiva.webtest.memory.TestRepositorySessionFactory; import org.apache.commons.io.FileUtils; import org.apache.archiva.redback.role.RoleManager; import org.codehaus.plexus.registry.Registry; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; import org.easymock.classextension.MockClassControl; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java index 37d727468..53ca83b95 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/EditRemoteRepositoryActionTest.java @@ -27,8 +27,8 @@ import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.struts2.StrutsSpringTestCase; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; import java.util.Collections; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoriesActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoriesActionTest.java index 25d5e9383..8840ef534 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoriesActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoriesActionTest.java @@ -31,8 +31,8 @@ import org.apache.archiva.webtest.memory.TestRepositorySessionFactory; import org.apache.archiva.metadata.repository.stats.RepositoryStatistics; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.struts2.StrutsSpringTestCase; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java index 80c64ba85..8e5bec742 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/RepositoryGroupsActionTest.java @@ -31,8 +31,8 @@ import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.RepositoryGroupConfiguration; import org.apache.archiva.web.action.AbstractActionTestCase; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; import java.util.Collections; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java index 5b31cdf1b..79a4b99b2 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/admin/repositories/SortRepositoriesActionTest.java @@ -24,8 +24,8 @@ import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.RepositoryGroupConfiguration; import org.apache.struts2.StrutsSpringTestCase; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.easymock.MockControl; /** diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index 4507dadf6..5975fa07e 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -86,7 +86,7 @@ import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java index 97a9f5b80..3735e4119 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavSessionProvider.java @@ -32,7 +32,7 @@ import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.users.UserManager; -import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; /** */ diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java index c9b6e807e..0d0271578 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/RepositoryServlet.java @@ -38,7 +38,7 @@ import org.apache.jackrabbit.webdav.WebdavRequestImpl; import org.apache.jackrabbit.webdav.WebdavResponse; import org.apache.jackrabbit.webdav.WebdavResponseImpl; import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet; -import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ConfigurableApplicationContext; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java index e2723ad4f..64499ead3 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/ArchivaDavSessionProviderTest.java @@ -33,7 +33,7 @@ import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.system.SecuritySession; -import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import javax.servlet.RequestDispatcher; import javax.servlet.ServletInputStream; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java index 091449e40..56fe9567b 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletSecurityTest.java @@ -44,8 +44,8 @@ import org.apache.archiva.redback.authorization.UnauthorizedException; import org.apache.archiva.redback.system.DefaultSecuritySession; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.users.memory.SimpleUser; -import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; -import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication; +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication; import org.easymock.MockControl; import org.easymock.classextension.MockClassControl; import org.junit.After;