From: Olivier Lamy Date: Sat, 7 Apr 2012 15:06:15 +0000 (+0000) Subject: move to package o.a.a.r X-Git-Tag: archiva-1.4-M3~830 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=22682eeaf8a841e6ad9becf7904db3cac9c11164;p=archiva.git move to package o.a.a.r git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1310784 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java index d1b5b53e1..2de737ac3 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java @@ -30,7 +30,7 @@ import org.apache.archiva.redback.users.User; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.codehaus.plexus.redback.role.RoleManager; -import org.codehaus.plexus.redback.users.memory.SimpleUser; +import org.apache.archiva.redback.users.memory.SimpleUser; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java index 5c6ef85d2..4e3f1fc7a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java @@ -35,7 +35,7 @@ import org.codehaus.plexus.redback.system.DefaultSecuritySystem; import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySystem; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.users.memory.MemoryUserManager; +import org.apache.archiva.redback.users.memory.MemoryUserManager; import org.springframework.stereotype.Service; /** 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 54b255180..ebda5fa46 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 @@ -43,7 +43,7 @@ import org.codehaus.plexus.redback.authentication.AuthenticationResult; import org.codehaus.plexus.redback.authorization.UnauthorizedException; import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.codehaus.plexus.redback.system.SecuritySession; -import org.codehaus.plexus.redback.users.memory.SimpleUser; +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.easymock.MockControl;