diff options
| author | Brett Porter <brett@apache.org> | 2008-03-14 11:13:29 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2008-03-14 11:13:29 +0000 |
| commit | d410cff584423cd08d392b445bc4ed1ac8f850e1 (patch) | |
| tree | 3fd9847eb114d3358c822d1516f156d045443d52 /archiva-database | |
| parent | 0a545acdd7e43562e87dbf37233b2032b60674cd (diff) | |
| download | archiva-d410cff584423cd08d392b445bc4ed1ac8f850e1.tar.gz archiva-d410cff584423cd08d392b445bc4ed1ac8f850e1.zip | |
merge the archiva-spring branch
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@637056 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-database')
3 files changed, 5 insertions, 5 deletions
diff --git a/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java b/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java index be87fc857..d40fed4d8 100644 --- a/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java +++ b/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java @@ -26,9 +26,9 @@ import org.apache.maven.archiva.database.updater.TestDatabaseCleanupConsumer; import org.apache.maven.archiva.database.updater.TestDatabaseUnprocessedConsumer; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.model.VersionedReference; -import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory; import org.codehaus.plexus.jdo.JdoFactory; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.jpox.SchemaTool; import java.io.File; @@ -49,7 +49,7 @@ import javax.jdo.PersistenceManagerFactory; * @version $Id$ */ public abstract class AbstractArchivaDatabaseTestCase - extends PlexusTestCase + extends PlexusInSpringTestCase { private static final String TIMESTAMP = "yyyy/MM/dd HH:mm:ss"; diff --git a/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java b/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java index 8f2e6bf27..3eb408b9c 100644 --- a/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java +++ b/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java @@ -61,7 +61,7 @@ public class RepositoryBrowsingTest public RepositoryBrowsing lookupBrowser() throws Exception { - RepositoryBrowsing browser = (RepositoryBrowsing) lookup( RepositoryBrowsing.class.getName() ); + RepositoryBrowsing browser = (RepositoryBrowsing) lookup( RepositoryBrowsing.class ); assertNotNull( "RepositoryBrowsing should not be null.", browser ); return browser; } diff --git a/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java b/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java index 18265657a..575774283 100644 --- a/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java +++ b/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java @@ -20,7 +20,7 @@ package org.apache.maven.archiva.database.updater; */ import org.apache.commons.collections.CollectionUtils; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.util.List; @@ -31,7 +31,7 @@ import java.util.List; * @version $Id$ */ public class DatabaseConsumersTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private DatabaseConsumers lookupDbConsumers() throws Exception |