diff options
9 files changed, 11 insertions, 14 deletions
diff --git a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java index 40741526d..a8d706ed3 100644 --- a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java +++ b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java @@ -31,7 +31,7 @@ import org.apache.archiva.redback.users.UserManager; import org.apache.commons.lang.SystemUtils; import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.rbac.RbacManagerException; -import org.codehaus.plexus.redback.tests.utils.RBACDefaults; +import org.apache.archiva.redback.tests.utils.RBACDefaults; import org.apache.archiva.redback.users.User; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java index 7ec39ce80..10167fc0d 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java @@ -20,8 +20,7 @@ package org.apache.archiva.redback.rbac.cached; */ import org.apache.archiva.redback.rbac.RBACManager; -import org.apache.archiva.redback.rbac.cached.CachedRbacManager; -import org.codehaus.plexus.redback.tests.AbstractRbacManagerPerformanceTestCase; +import org.apache.archiva.redback.tests.AbstractRbacManagerPerformanceTestCase; import org.junit.After; import org.junit.Before; diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java index 309e292bf..6235f208f 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java @@ -21,8 +21,7 @@ package org.apache.archiva.redback.rbac.cached; import net.sf.ehcache.CacheManager; import org.apache.archiva.redback.rbac.RBACManager; -import org.apache.archiva.redback.rbac.cached.CachedRbacManager; -import org.codehaus.plexus.redback.tests.AbstractRbacManagerTestCase; +import org.apache.archiva.redback.tests.AbstractRbacManagerTestCase; import org.junit.Before; import javax.inject.Inject; diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java index 6535efeb1..ee1704879 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java @@ -21,11 +21,10 @@ package org.apache.archiva.redback.rbac.jdo; import net.sf.ehcache.CacheManager; import org.apache.archiva.redback.rbac.RbacManagerException; -import org.apache.archiva.redback.rbac.jdo.JdoRbacManager; import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory; import org.apache.archiva.redback.common.jdo.test.StoreManagerDebug; import org.apache.archiva.redback.rbac.RBACManager; -import org.codehaus.plexus.redback.tests.AbstractRbacManagerTestCase; +import org.apache.archiva.redback.tests.AbstractRbacManagerTestCase; import org.jpox.AbstractPersistenceManagerFactory; import org.jpox.SchemaTool; import org.junit.Before; diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java index 02df93a98..00c0c6a52 100644 --- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java +++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java @@ -20,7 +20,7 @@ package org.apache.archiva.redback.rbac.memory; */ import org.apache.archiva.redback.rbac.RBACManager; -import org.codehaus.plexus.redback.tests.AbstractRbacManagerTestCase; +import org.apache.archiva.redback.tests.AbstractRbacManagerTestCase; import org.junit.Before; import javax.inject.Inject; diff --git a/redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/AbstractRbacManagerPerformanceTestCase.java b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerPerformanceTestCase.java index de09ba39c..b442b3cf4 100644 --- a/redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/AbstractRbacManagerPerformanceTestCase.java +++ b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerPerformanceTestCase.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.tests; +package org.apache.archiva.redback.tests; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,7 +26,7 @@ import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.rbac.UserAssignment; import org.apache.archiva.redback.rbac.Operation; -import org.codehaus.plexus.redback.tests.utils.RBACDefaults; +import org.apache.archiva.redback.tests.utils.RBACDefaults; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; diff --git a/redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/AbstractRbacManagerTestCase.java b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java index 47a458c26..dfd2597ab 100644 --- a/redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/AbstractRbacManagerTestCase.java +++ b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.tests; +package org.apache.archiva.redback.tests; /* * Copyright 2001-2006 The Apache Software Foundation. @@ -25,7 +25,7 @@ import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.rbac.UserAssignment; import org.apache.archiva.redback.rbac.Permission; import org.apache.archiva.redback.rbac.RbacPermanentException; -import org.codehaus.plexus.redback.tests.utils.RBACDefaults; +import org.apache.archiva.redback.tests.utils.RBACDefaults; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; diff --git a/redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/RbacManagerEventTracker.java b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java index 79a551033..b5f86fa57 100644 --- a/redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/RbacManagerEventTracker.java +++ b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/RbacManagerEventTracker.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.tests; +package org.apache.archiva.redback.tests; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/utils/RBACDefaults.java b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/utils/RBACDefaults.java index aa1f0a477..16c85afca 100644 --- a/redback-rbac/redback-rbac-tests/src/main/java/org/codehaus/plexus/redback/tests/utils/RBACDefaults.java +++ b/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/utils/RBACDefaults.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.tests.utils; +package org.apache.archiva.redback.tests.utils; /* * Copyright 2006 The Apache Software Foundation. |