Author: brett
Date: Wed Mar 12 22:58:35 2008
New Revision: 636637
URL: http://svn.apache.org/viewvc?rev=636637&view=rev
Log:
make more of the tests spring enabled
Added:
maven/archiva/branches/springy/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
- copied unchanged from r636531,
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml
Removed:
maven/archiva/branches/springy/archiva-base/archiva-configuration/src/test/resources/org/apache/maven/archiva/configuration/spring-context.xml
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/org/apache/maven/archiva/policies/CachedFailuresPolicyTest-context.xml
maven/archiva/branches/springy/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/spring-context.xml
maven/archiva/branches/springy/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/spring-context.xml
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/resources/org/apache/maven/archiva/web/repository/spring-context.xml
Modified:
maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java
maven/archiva/branches/springy/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java
maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java
maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
maven/archiva/branches/springy/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
Modified:
maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
(original)
+++
maven/archiva/branches/springy/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/maven/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
Wed Mar 12 22:58:35 2008
@@ -25,9 +25,9 @@
import org.apache.maven.archiva.database.ArtifactDAO;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
-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;
@@ -46,7 +46,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Maria Odea Ching</a>
*/
public abstract class AbstractRepositoryPurgeTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
public static final String TEST_REPO_ID = "test-repo";
Modified:
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
(original)
+++
maven/archiva/branches/springy/archiva-base/archiva-policies/src/test/resources/log4j.xml
Wed Mar 12 22:58:35 2008
@@ -39,8 +39,12 @@
<level value="error"/>
</logger>
+ <logger name="org.codehaus.plexus.spring">
+ <level value="warn"/>
+ </logger>
+
<logger name="org.springframework">
- <level value="DEBUG"/>
+ <level value="warn"/>
</logger>
<root>
Modified:
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java
(original)
+++
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/AbstractArchivaDatabaseTestCase.java
Wed Mar 12 22:58:35 2008
@@ -26,9 +26,9 @@
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 @@
* @version $Id$
*/
public abstract class AbstractArchivaDatabaseTestCase
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private static final String TIMESTAMP = "yyyy/MM/dd HH:mm:ss";
Modified:
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java
(original)
+++
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/browsing/RepositoryBrowsingTest.java
Wed Mar 12 22:58:35 2008
@@ -61,7 +61,7 @@
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;
}
Modified:
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java
(original)
+++
maven/archiva/branches/springy/archiva-database/src/test/java/org/apache/maven/archiva/database/updater/DatabaseConsumersTest.java
Wed Mar 12 22:58:35 2008
@@ -20,7 +20,7 @@
*/
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 @@
* @version $Id$
*/
public class DatabaseConsumersTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private DatabaseConsumers lookupDbConsumers()
throws Exception
Modified:
maven/archiva/branches/springy/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java
(original)
+++
maven/archiva/branches/springy/archiva-reporting/archiva-artifact-reports/src/test/java/org/apache/maven/archiva/reporting/artifact/AbstractArtifactReportsTestCase.java
Wed Mar 12 22:58:35 2008
@@ -20,9 +20,9 @@
*/
import org.apache.maven.archiva.database.ArchivaDAO;
-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;
@@ -41,7 +41,7 @@
* @version $Id$
*/
public abstract class AbstractArtifactReportsTestCase
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
protected ArchivaDAO dao;
Modified:
maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java
(original)
+++
maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutorTest.java
Wed Mar 12 22:58:35 2008
@@ -26,9 +26,9 @@
import
org.apache.maven.archiva.database.constraints.ArtifactsProcessedConstraint;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
-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.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.jpox.SchemaTool;
@@ -51,7 +51,7 @@
* @version $Id:$
*/
public class ArchivaDatabaseUpdateTaskExecutorTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private TaskExecutor taskExecutor;
Modified:
maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
(original)
+++
maven/archiva/branches/springy/archiva-scheduled/src/test/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutorTest.java
Wed Mar 12 22:58:35 2008
@@ -26,9 +26,9 @@
import org.apache.maven.archiva.database.ArtifactDAO;
import
org.apache.maven.archiva.database.constraints.ArtifactsProcessedConstraint;
import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
-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.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.jpox.SchemaTool;
@@ -49,7 +49,7 @@
* @version $Id$
*/
public class ArchivaRepositoryScanningTaskExecutorTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private TaskExecutor taskExecutor;
Modified:
maven/archiva/branches/springy/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java
(original)
+++
maven/archiva/branches/springy/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/SecurityStartupTest.java
Wed Mar 12 22:58:35 2008
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
/**
* SecurityStartupTest
@@ -28,7 +28,7 @@
* @version $Id$
*/
public class SecurityStartupTest
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
private SecurityStartup secStart;
Modified:
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java?rev=636637&r1=636636&r2=636637&view=diff
==============================================================================
---
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
(original)
+++
maven/archiva/branches/springy/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/repository/AbstractRepositoryServletTestCase.java
Wed Mar 12 22:58:35 2008
@@ -23,13 +23,12 @@
import com.meterware.servletunit.ServletRunner;
import com.meterware.servletunit.ServletUnitClient;
import org.apache.commons.io.FileUtils;
-import org.apache.maven.archiva.common.spring.PlexusFactory;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusTestCase;
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.ClassPathResource;
@@ -47,7 +46,7 @@
* @version $Id$
*/
public abstract class AbstractRepositoryServletTestCase
- extends PlexusTestCase
+ extends PlexusInSpringTestCase
{
protected static final String REPOID_INTERNAL = "internal";
@@ -145,48 +144,44 @@
throws Exception
{
super.setUp();
-
- String appserverBase = getTestFile( "target/appserver-base"
).getAbsolutePath();
- System.setProperty( "appserver.base", appserverBase );
-
- File testConf = getTestFile(
"src/test/resources/repository-archiva.xml" );
- File testConfDest = new File( appserverBase, "conf/archiva.xml" );
- FileUtils.copyFile( testConf, testConfDest );
-
- BeanFactory factory = new XmlBeanFactory(
- new ClassPathResource(
"/org/apache/maven/archiva/web/repository/spring-context.xml" ) );
- getContainer().getContext().put( BeanFactory.class, factory );
- PlexusFactory plexusFactory = (PlexusFactory) factory.getBean(
"plexusCacheFactory" );
- plexusFactory.setContainer( container );
-
- archivaConfiguration = (ArchivaConfiguration) lookup(
ArchivaConfiguration.class );
- repoRootInternal = new File( appserverBase,
"data/repositories/internal" );
- Configuration config = archivaConfiguration.getConfiguration();
-
- config.addManagedRepository( createManagedRepository( REPOID_INTERNAL,
"Internal Test Repo", repoRootInternal ) );
- saveConfiguration();
-
- sr = new ServletRunner();
- sr.registerServlet( "/repository/*",
UnauthenticatedRepositoryServlet.class.getName() );
- sc = sr.newClient();
- HttpSession session = sc.getSession( true );
- ServletContext servletContext = session.getServletContext();
- servletContext.setAttribute( PlexusConstants.PLEXUS_KEY,
getContainer() );
+
+ try
+ {
+ String appserverBase = getTestFile( "target/appserver-base"
).getAbsolutePath();
+ System.setProperty( "appserver.base", appserverBase );
+
+ File testConf = getTestFile(
"src/test/resources/repository-archiva.xml" );
+ File testConfDest = new File( appserverBase, "conf/archiva.xml" );
+ FileUtils.copyFile( testConf, testConfDest );
+
+ archivaConfiguration = (ArchivaConfiguration) lookup(
ArchivaConfiguration.class );
+ repoRootInternal = new File( appserverBase,
"data/repositories/internal" );
+ Configuration config = archivaConfiguration.getConfiguration();
+
+ config.addManagedRepository( createManagedRepository(
REPOID_INTERNAL, "Internal Test Repo", repoRootInternal ) );
+ saveConfiguration();
+
+ sr = new ServletRunner();
+ sr.registerServlet( "/repository/*",
UnauthenticatedRepositoryServlet.class.getName() );
+ sc = sr.newClient();
+ }
+ finally
+ {
+ tearDown();
+ }
}
-
+
@Override
- protected String getConfigurationName( String subname )
+ protected String getPlexusConfigLocation()
throws Exception
{
return
"org/apache/maven/archiva/web/repository/RepositoryServletTest.xml";
}
-
+
@Override
protected void tearDown()
throws Exception
{
- release( archivaConfiguration );
-
if ( sc != null )
{
sc.clearContents();
