fix compilation due to package change

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1311429 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java
index 83bde56ca51926bf8401fe095ad09592fc3768ef..d8b14ffa88733b8b9220218f0fbd43838734ee39 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRoleManager.java
@@ -18,9 +18,9 @@ package org.apache.archiva.consumers.lucene.test;
  * under the License.
  */
 
-import org.apache.archiva.redback.role.RoleManagerException;
 import org.apache.archiva.redback.role.RoleManager;
-import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
+import org.apache.archiva.redback.role.RoleManagerException;
+import org.apache.archiva.redback.role.model.RedbackRoleModel;
 import org.springframework.stereotype.Service;
 
 import java.net.URL;
@@ -29,7 +29,8 @@ import java.net.URL;
  * @author Olivier Lamy
  */
 @Service( "roleManager#test" )
-public class TestRoleManager implements RoleManager
+public class TestRoleManager
+    implements RoleManager
 {
     public void loadRoleModel( URL resourceLocation )
         throws RoleManagerException

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java
index 53677aa6b6fe9a69d411aa0e8040a14baa6b2c7f..ad0b10f34099fbab97039b8890ad9d9fb2a63839 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RoleManagerStub.java
@@ -20,7 +20,7 @@ package org.apache.archiva.web.rss;
 
 import org.apache.archiva.redback.role.RoleManagerException;
 import org.apache.archiva.redback.role.RoleManager;
-import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
+import org.apache.archiva.redback.role.model.RedbackRoleModel;
 import org.springframework.stereotype.Service;
 
 import java.net.URL;

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
index 4b3c97a77ccb323a15fe18337eb32dbd3f1ec847..38bdb600379220e3c3ce3ffba87001b21a49b5bd 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
@@ -35,7 +35,7 @@ import org.apache.archiva.redback.authorization.AuthorizationResult;
 import org.apache.archiva.redback.system.DefaultSecuritySession;
 import org.apache.archiva.redback.system.SecuritySession;
 import org.apache.archiva.redback.system.SecuritySystem;
-import org.codehaus.plexus.redback.users.jdo.JdoUser;
+import org.apache.archiva.redback.users.jdo.JdoUser;
 
 import java.util.ArrayList;
 import java.util.Date;