You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/05/25 17:31:32 UTC
svn commit: r1127555 [3/3] - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/
archiva-modules/archiva-base/archiva-repository-layer/
archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/a...
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java Wed May 25 15:31:30 2011
@@ -22,7 +22,6 @@ package org.apache.maven.archiva.reposit
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.common.utils.VersionComparator;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.model.ProjectReference;
@@ -38,8 +37,12 @@ import org.apache.maven.archiva.reposito
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.custommonkey.xmlunit.DetailedDiff;
import org.custommonkey.xmlunit.Diff;
+import org.junit.Test;
+import org.springframework.test.context.ContextConfiguration;
import org.xml.sax.SAXException;
+import javax.inject.Inject;
+import javax.inject.Named;
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.IOException;
@@ -53,27 +56,30 @@ import java.util.Set;
*
* @version $Id$
*/
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context-metadata-tools-test.xml" } )
public class MetadataToolsTest
extends AbstractRepositoryLayerTestCase
{
+ @Inject @Named(value = "metadataTools#test")
private MetadataTools tools;
+ @Inject
+ @Named( value = "archivaConfiguration#mock" )
protected MockConfiguration config;
+
+ @Test
public void testGatherSnapshotVersionsA()
throws Exception
{
- assertSnapshotVersions( "snap_shots_a", "1.0-alpha-11-SNAPSHOT", new String[] {
- "1.0-alpha-11-SNAPSHOT",
- "1.0-alpha-11-20070221.194724-2",
- "1.0-alpha-11-20070302.212723-3",
- "1.0-alpha-11-20070303.152828-4",
- "1.0-alpha-11-20070305.215149-5",
- "1.0-alpha-11-20070307.170909-6",
- "1.0-alpha-11-20070314.211405-9",
- "1.0-alpha-11-20070316.175232-11" } );
+ assertSnapshotVersions( "snap_shots_a", "1.0-alpha-11-SNAPSHOT",
+ new String[]{ "1.0-alpha-11-SNAPSHOT", "1.0-alpha-11-20070221.194724-2",
+ "1.0-alpha-11-20070302.212723-3", "1.0-alpha-11-20070303.152828-4",
+ "1.0-alpha-11-20070305.215149-5", "1.0-alpha-11-20070307.170909-6",
+ "1.0-alpha-11-20070314.211405-9", "1.0-alpha-11-20070316.175232-11" } );
}
+ @Test
public void testGatherSnapshotVersionsAWithProxies()
throws Exception
{
@@ -83,31 +89,28 @@ public class MetadataToolsTest
createProxyConnector( "test-repo", "internal-snapshots" );
createProxyConnector( "test-repo", "snapshots.codehaus.org" );
- assertSnapshotVersions( "snap_shots_a", "1.0-alpha-11-SNAPSHOT", new String[] {
- "1.0-alpha-11-SNAPSHOT",
- "1.0-alpha-11-20070221.194724-2",
- "1.0-alpha-11-20070302.212723-3",
- "1.0-alpha-11-20070303.152828-4",
- "1.0-alpha-11-20070305.215149-5",
- "1.0-alpha-11-20070307.170909-6",
- "1.0-alpha-11-20070314.211405-9",
- "1.0-alpha-11-20070315.033030-10" /* Arrives in via snapshots.codehaus.org proxy */,
- "1.0-alpha-11-20070316.175232-11" } );
+ assertSnapshotVersions( "snap_shots_a", "1.0-alpha-11-SNAPSHOT",
+ new String[]{ "1.0-alpha-11-SNAPSHOT", "1.0-alpha-11-20070221.194724-2",
+ "1.0-alpha-11-20070302.212723-3", "1.0-alpha-11-20070303.152828-4",
+ "1.0-alpha-11-20070305.215149-5", "1.0-alpha-11-20070307.170909-6",
+ "1.0-alpha-11-20070314.211405-9", "1.0-alpha-11-20070315.033030-10"
+ /* Arrives in via snapshots.codehaus.org proxy */,
+ "1.0-alpha-11-20070316.175232-11" } );
}
+ @Test
public void testGetRepositorySpecificName()
throws Exception
{
- RemoteRepositoryContent repoJavaNet = createRemoteRepositoryContent( "maven2-repository.dev.java.net",
- "Java.net Repository for Maven 2",
- "http://download.java.net/maven/2/",
- "default" );
- RemoteRepositoryContent repoCentral = createRemoteRepositoryContent( "central", "Central Global Repository",
- "http://repo1.maven.org/maven2/",
- "default" );
+ RemoteRepositoryContent repoJavaNet =
+ createRemoteRepositoryContent( "maven2-repository.dev.java.net", "Java.net Repository for Maven 2",
+ "http://download.java.net/maven/2/", "default" );
+ RemoteRepositoryContent repoCentral =
+ createRemoteRepositoryContent( "central", "Central Global Repository", "http://repo1.maven.org/maven2/",
+ "default" );
- String convertedName = tools.getRepositorySpecificName( repoJavaNet,
- "commons-lang/commons-lang/maven-metadata.xml" );
+ String convertedName =
+ tools.getRepositorySpecificName( repoJavaNet, "commons-lang/commons-lang/maven-metadata.xml" );
assertMetadataPath( "commons-lang/commons-lang/maven-metadata-maven2-repository.dev.java.net.xml",
convertedName );
@@ -130,6 +133,7 @@ public class MetadataToolsTest
// }
// }
+ @Test
public void testUpdateProjectNonExistingVersion()
throws Exception
{
@@ -139,32 +143,28 @@ public class MetadataToolsTest
reference.setArtifactId( "missing_artifact" );
prepTestRepo( testRepo, reference );
-
+
// check metadata prior to update -- should contain the non-existing artifact version
- assertProjectMetadata( testRepo, reference, "missing_artifact", new String[] {
- "1.0-SNAPSHOT",
- "1.1-SNAPSHOT",
- "1.2-SNAPSHOT" }, "1.2-SNAPSHOT" , null );
+ assertProjectMetadata( testRepo, reference, "missing_artifact",
+ new String[]{ "1.0-SNAPSHOT", "1.1-SNAPSHOT", "1.2-SNAPSHOT" }, "1.2-SNAPSHOT", null );
tools.updateMetadata( testRepo, reference );
-
+
// metadata should not contain the non-existing artifact version -- 1.1-SNAPSHOT
- assertProjectMetadata( testRepo, reference, "missing_artifact", new String[] {
- "1.0-SNAPSHOT",
- "1.2-SNAPSHOT" }, "1.2-SNAPSHOT" , null );
+ assertProjectMetadata( testRepo, reference, "missing_artifact", new String[]{ "1.0-SNAPSHOT", "1.2-SNAPSHOT" },
+ "1.2-SNAPSHOT", null );
}
+ @Test
public void testUpdateProjectMissingMultipleVersions()
throws Exception
{
- assertUpdatedProjectMetadata( "missing_metadata_b", new String[] {
- "1.0",
- "1.0.1",
- "2.0",
- "2.0.1",
- "2.0-20070821-dev" }, "2.0-20070821-dev" , "2.0-20070821-dev" );
+ assertUpdatedProjectMetadata( "missing_metadata_b",
+ new String[]{ "1.0", "1.0.1", "2.0", "2.0.1", "2.0-20070821-dev" },
+ "2.0-20070821-dev", "2.0-20070821-dev" );
}
+ @Test
public void testUpdateProjectMissingMultipleVersionsWithProxies()
throws Exception
{
@@ -174,56 +174,58 @@ public class MetadataToolsTest
createProxyConnector( "test-repo", "central" );
createProxyConnector( "test-repo", "java.net" );
- assertUpdatedProjectMetadata( "proxied_multi", new String[] {
- "1.0-spec" /* in java.net */,
- "1.0" /* in managed, and central */,
- "1.0.1" /* in central */,
- "1.1" /* in managed */,
- "2.0-proposal-beta" /* in java.net */,
- "2.0-spec" /* in java.net */,
- "2.0" /* in central, and java.net */,
- "2.0.1" /* in java.net */,
- "2.1" /* in managed */,
- "3.0" /* in central */,
- "3.1" /* in central */}, "3.1", "3.1" );
+ assertUpdatedProjectMetadata( "proxied_multi",
+ new String[]{ "1.0-spec" /* in java.net */, "1.0" /* in managed, and central */,
+ "1.0.1" /* in central */, "1.1" /* in managed */, "2.0-proposal-beta"
+ /* in java.net */, "2.0-spec" /* in java.net */, "2.0"
+ /* in central, and java.net */, "2.0.1" /* in java.net */, "2.1"
+ /* in managed */, "3.0" /* in central */, "3.1" /* in central */ }, "3.1",
+ "3.1" );
}
+ @Test
public void testUpdateProjectSimpleYetIncomplete()
throws Exception
{
- assertUpdatedProjectMetadata( "incomplete_metadata_a", new String[] { "1.0" }, "1.0", "1.0" );
+ assertUpdatedProjectMetadata( "incomplete_metadata_a", new String[]{ "1.0" }, "1.0", "1.0" );
}
+ @Test
public void testUpdateProjectSimpleYetMissing()
throws Exception
{
- assertUpdatedProjectMetadata( "missing_metadata_a", new String[] { "1.0" }, "1.0", "1.0" );
+ assertUpdatedProjectMetadata( "missing_metadata_a", new String[]{ "1.0" }, "1.0", "1.0" );
}
+ @Test
public void testUpdateVersionSimple10()
throws Exception
{
assertUpdatedReleaseVersionMetadata( "missing_metadata_a", "1.0" );
}
+ @Test
public void testUpdateVersionSimple20()
throws Exception
{
assertUpdatedReleaseVersionMetadata( "missing_metadata_b", "2.0" );
}
+ @Test
public void testUpdateVersionSimple20NotSnapshot()
throws Exception
{
assertUpdatedReleaseVersionMetadata( "missing_metadata_b", "2.0-20070821-dev" );
}
+ @Test
public void testUpdateVersionSnapshotA()
throws Exception
{
assertUpdatedSnapshotVersionMetadata( "snap_shots_a", "1.0-alpha-11-SNAPSHOT", "20070316", "175232", "11" );
}
+ @Test
public void testToPathFromVersionReference()
{
VersionedReference reference = new VersionedReference();
@@ -234,6 +236,7 @@ public class MetadataToolsTest
assertEquals( "com/foo/foo-tool/1.0/maven-metadata.xml", tools.toPath( reference ) );
}
+ @Test
public void testToPathFromProjectReference()
{
ProjectReference reference = new ProjectReference();
@@ -243,12 +246,14 @@ public class MetadataToolsTest
assertEquals( "com/foo/foo-tool/maven-metadata.xml", tools.toPath( reference ) );
}
+ @Test
public void testToProjectReferenceFooTools()
throws RepositoryMetadataException
{
assertProjectReference( "com.foo", "foo-tools", "com/foo/foo-tools/maven-metadata.xml" );
}
+ @Test
public void testToProjectReferenceAReallyLongPath()
throws RepositoryMetadataException
{
@@ -259,6 +264,7 @@ public class MetadataToolsTest
assertProjectReference( groupId, artifactId, path );
}
+ @Test
public void testToProjectReferenceCommonsLang()
throws RepositoryMetadataException
{
@@ -279,6 +285,7 @@ public class MetadataToolsTest
assertEquals( "ProjectReference.artifactId", artifactId, reference.getArtifactId() );
}
+ @Test
public void testToVersionedReferenceFooTool()
throws RepositoryMetadataException
{
@@ -290,6 +297,7 @@ public class MetadataToolsTest
assertVersionedReference( groupId, artifactId, version, path );
}
+ @Test
public void testToVersionedReferenceAReallyLongPath()
throws RepositoryMetadataException
{
@@ -301,6 +309,7 @@ public class MetadataToolsTest
assertVersionedReference( groupId, artifactId, version, path );
}
+ @Test
public void testToVersionedReferenceCommonsLang()
throws RepositoryMetadataException
{
@@ -312,6 +321,7 @@ public class MetadataToolsTest
assertVersionedReference( groupId, artifactId, version, path );
}
+ @Test
public void testToVersionedReferenceSnapshot()
throws RepositoryMetadataException
{
@@ -344,10 +354,10 @@ public class MetadataToolsTest
reference.setArtifactId( artifactId );
reference.setVersion( version );
- ManagedRepositoryConfiguration repo = createRepository( "test-repo", "Test Repository: " + getName(),
- repoRootDir );
- ManagedRepositoryContent repoContent = (ManagedRepositoryContent) lookup( ManagedRepositoryContent.class,
- "default" );
+ ManagedRepositoryConfiguration repo =
+ createRepository( "test-repo", "Test Repository: " + getName(), repoRootDir );
+ ManagedRepositoryContent repoContent =
+ applicationContext.getBean( "managedRepositoryContent#default", ManagedRepositoryContent.class );
repoContent.setRepository( repo );
Set<String> testedVersionSet = tools.gatherSnapshotVersions( repoContent, reference );
@@ -446,15 +456,16 @@ public class MetadataToolsTest
assertMetadata( buf.toString(), testRepo, reference );
}
- private void assertProjectMetadata( ManagedRepositoryContent testRepo, ProjectReference reference, String artifactId,
- String[] expectedVersions, String latestVersion, String releaseVersion )
+ private void assertProjectMetadata( ManagedRepositoryContent testRepo, ProjectReference reference,
+ String artifactId, String[] expectedVersions, String latestVersion,
+ String releaseVersion )
throws Exception
{
StringBuilder buf = new StringBuilder();
buf.append( "<metadata>\n" );
buf.append( " <groupId>" ).append( reference.getGroupId() ).append( "</groupId>\n" );
buf.append( " <artifactId>" ).append( reference.getArtifactId() ).append( "</artifactId>\n" );
-
+
if ( expectedVersions != null )
{
buf.append( " <versioning>\n" );
@@ -571,11 +582,11 @@ public class MetadataToolsTest
repoRoot.mkdirs();
- ManagedRepositoryConfiguration repoConfig = createRepository( "test-repo", "Test Repository: " + getName(),
- repoRoot );
+ ManagedRepositoryConfiguration repoConfig =
+ createRepository( "test-repo", "Test Repository: " + getName(), repoRoot );
- ManagedRepositoryContent repoContent = (ManagedRepositoryContent) lookup( ManagedRepositoryContent.class,
- "default" );
+ ManagedRepositoryContent repoContent =
+ applicationContext.getBean( "managedRepositoryContent#default", ManagedRepositoryContent.class );
repoContent.setRepository( repoConfig );
return repoContent;
}
@@ -606,12 +617,5 @@ public class MetadataToolsTest
prepTestRepo( repo, projectRef );
}
- protected void setUp()
- throws Exception
- {
- super.setUp();
- config = (MockConfiguration) lookup( ArchivaConfiguration.class.getName(), "mock" );
- tools = (MetadataTools) lookup( MetadataTools.class );
- }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReaderTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReaderTest.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReaderTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReaderTest.java Wed May 25 15:31:30 2011
@@ -19,21 +19,28 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import junit.framework.TestCase;
import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import java.io.File;
/**
- * RepositoryMetadataReaderTest
+ * RepositoryMetadataReaderTest
*
* @version $Id$
*/
-public class RepositoryMetadataReaderTest extends PlexusInSpringTestCase
+@RunWith( JUnit4.class )
+public class RepositoryMetadataReaderTest
+ extends TestCase
{
- public void testLoadSimple() throws RepositoryMetadataException
+ @Test
+ public void testLoadSimple()
+ throws RepositoryMetadataException
{
- File defaultRepoDir = new File( getBasedir(), "src/test/repositories/default-repository" );
+ File defaultRepoDir = new File( "src/test/repositories/default-repository" );
File metadataFile = new File( defaultRepoDir, "org/apache/maven/shared/maven-downloader/maven-metadata.xml" );
ArchivaRepositoryMetadata metadata = RepositoryMetadataReader.read( metadataFile );
@@ -46,10 +53,12 @@ public class RepositoryMetadataReaderTes
assertTrue( "Available version 1.0", metadata.getAvailableVersions().contains( "1.0" ) );
assertTrue( "Available version 1.1", metadata.getAvailableVersions().contains( "1.1" ) );
}
-
- public void testLoadComplex() throws RepositoryMetadataException
+
+ @Test
+ public void testLoadComplex()
+ throws RepositoryMetadataException
{
- File defaultRepoDir = new File( getBasedir(), "src/test/repositories/default-repository" );
+ File defaultRepoDir = new File( "src/test/repositories/default-repository" );
File metadataFile = new File( defaultRepoDir, "org/apache/maven/samplejar/maven-metadata.xml" );
ArchivaRepositoryMetadata metadata = RepositoryMetadataReader.read( metadataFile );
@@ -60,7 +69,8 @@ public class RepositoryMetadataReaderTes
assertEquals( "Released Version", "2.0", metadata.getReleasedVersion() );
assertEquals( "Latest Version", "6.0-SNAPSHOT", metadata.getLatestVersion() );
assertEquals( "List of Available Versions", 18, metadata.getAvailableVersions().size() );
- assertTrue( "Available version 6.0-20060311.183228-10", metadata.getAvailableVersions().contains( "6.0-20060311.183228-10" ) );
+ assertTrue( "Available version 6.0-20060311.183228-10",
+ metadata.getAvailableVersions().contains( "6.0-20060311.183228-10" ) );
assertTrue( "Available version 6.0-SNAPSHOT", metadata.getAvailableVersions().contains( "6.0-SNAPSHOT" ) );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriterTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriterTest.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriterTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriterTest.java Wed May 25 15:31:30 2011
@@ -19,10 +19,13 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.custommonkey.xmlunit.XMLAssert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import java.io.File;
import java.io.StringWriter;
@@ -32,13 +35,16 @@ import java.io.StringWriter;
*
* @version $Id$
*/
+@RunWith( JUnit4.class )
public class RepositoryMetadataWriterTest
- extends PlexusInSpringTestCase
+ extends TestCase
{
+
+ @Test
public void testWriteSimple()
throws Exception
{
- File defaultRepoDir = new File( getBasedir(), "src/test/repositories/default-repository" );
+ File defaultRepoDir = new File( "src/test/repositories/default-repository" );
File expectedFile = new File( defaultRepoDir, "org/apache/maven/shared/maven-downloader/maven-metadata.xml" );
String expectedContent = FileUtils.readFileToString( expectedFile, null );
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml Wed May 25 15:31:30 2011
@@ -11,8 +11,8 @@
<name>Archiva Base :: Scheduled Tasks :: API</name>
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-taskqueue</artifactId>
+ <groupId>org.codehaus.redback.components</groupId>
+ <artifactId>spring-taskqueue</artifactId>
</dependency>
</dependencies>
</project>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Wed May 25 15:31:30 2011
@@ -41,11 +41,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.redback.components</groupId>
- <artifactId>plexus-spring</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutor.java Wed May 25 15:31:30 2011
@@ -39,7 +39,11 @@ import org.codehaus.plexus.taskqueue.exe
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
import java.util.Date;
/**
@@ -49,42 +53,49 @@ import java.util.Date;
* @plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
* role-hint="repository-scanning"
*/
+@Service("taskExecutor#repository-scanning")
public class ArchivaRepositoryScanningTaskExecutor
implements TaskExecutor, Initializable
{
private Logger log = LoggerFactory.getLogger( ArchivaRepositoryScanningTaskExecutor.class );
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private ArchivaConfiguration archivaConfiguration;
/**
* The repository scanner component.
*
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private RepositoryScanner repoScanner;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private RepositoryContentConsumers consumers;
private Task task;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private RepositoryStatisticsManager repositoryStatisticsManager;
/**
* TODO: may be different implementations
*
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private RepositorySessionFactory repositorySessionFactory;
+ @PostConstruct
public void initialize()
throws InitializationException
{
@@ -120,12 +131,12 @@ public class ArchivaRepositoryScanningTa
// execute consumers on resource file if set
if ( repoTask.getResourceFile() != null )
{
- log.debug( "Executing task from queue with job name: " + repoTask );
+ log.debug( "Executing task from queue with job name: {}", repoTask );
consumers.executeConsumers( arepo, repoTask.getResourceFile(), repoTask.isUpdateRelatedArtifacts() );
}
else
{
- log.info( "Executing task from queue with job name: " + repoTask );
+ log.info( "Executing task from queue with job name: {}", repoTask );
// otherwise, execute consumers on whole repository
if ( arepo == null )
@@ -188,7 +199,7 @@ public class ArchivaRepositoryScanningTa
// metadataRepository.findAllProjects();
// FIXME: do something
- log.info( "Finished repository task: " + repoTask );
+ log.info( "Finished repository task: {}", repoTask );
this.task = null;
}
@@ -198,4 +209,54 @@ public class ArchivaRepositoryScanningTa
{
return task;
}
+
+ public ArchivaConfiguration getArchivaConfiguration()
+ {
+ return archivaConfiguration;
+ }
+
+ public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration )
+ {
+ this.archivaConfiguration = archivaConfiguration;
+ }
+
+ public RepositoryScanner getRepoScanner()
+ {
+ return repoScanner;
+ }
+
+ public void setRepoScanner( RepositoryScanner repoScanner )
+ {
+ this.repoScanner = repoScanner;
+ }
+
+ public RepositoryContentConsumers getConsumers()
+ {
+ return consumers;
+ }
+
+ public void setConsumers( RepositoryContentConsumers consumers )
+ {
+ this.consumers = consumers;
+ }
+
+ public RepositorySessionFactory getRepositorySessionFactory()
+ {
+ return repositorySessionFactory;
+ }
+
+ public void setRepositorySessionFactory( RepositorySessionFactory repositorySessionFactory )
+ {
+ this.repositorySessionFactory = repositorySessionFactory;
+ }
+
+ public RepositoryStatisticsManager getRepositoryStatisticsManager()
+ {
+ return repositoryStatisticsManager;
+ }
+
+ public void setRepositoryStatisticsManager( RepositoryStatisticsManager repositoryStatisticsManager )
+ {
+ this.repositoryStatisticsManager = repositoryStatisticsManager;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryArchivaTaskScheduler.java Wed May 25 15:31:30 2011
@@ -35,6 +35,7 @@ import org.codehaus.plexus.personality.p
import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
import org.codehaus.plexus.scheduler.CronExpressionValidator;
import org.codehaus.plexus.scheduler.Scheduler;
+import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.TaskQueue;
import org.codehaus.plexus.taskqueue.TaskQueueException;
import org.quartz.CronTrigger;
@@ -43,7 +44,10 @@ import org.quartz.JobDetail;
import org.quartz.SchedulerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import javax.inject.Inject;
+import javax.inject.Named;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashSet;
@@ -55,36 +59,42 @@ import java.util.Set;
*
* @plexus.component role="org.apache.archiva.scheduler.ArchivaTaskScheduler" role-hint="repository"
*/
+@Service("archivaTaskScheduler#repository")
public class RepositoryArchivaTaskScheduler
implements ArchivaTaskScheduler<RepositoryTask>, Startable, ConfigurationListener
{
private Logger log = LoggerFactory.getLogger( RepositoryArchivaTaskScheduler.class );
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private Scheduler scheduler;
/**
- * @plexus.requirement role-hint="repository-scanning"
+ * plexus.requirement role-hint="repository-scanning"
*/
+ @Inject @Named(value = "taskQueue#repository-scanning")
private TaskQueue repositoryScanningQueue;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private ArchivaConfiguration archivaConfiguration;
/**
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private RepositoryStatisticsManager repositoryStatisticsManager;
/**
* TODO: could have multiple implementations
*
- * @plexus.requirement
+ * plexus.requirement
*/
+ @Inject
private RepositorySessionFactory repositorySessionFactory;
private static final String REPOSITORY_SCAN_GROUP = "rg";
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java Wed May 25 15:31:30 2011
@@ -1,24 +1,26 @@
package org.apache.archiva.metadata.repository;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+import org.springframework.stereotype.Service;
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+@Service("repositorySessionFactory#test")
public class TestRepositorySessionFactory
implements RepositorySessionFactory
{
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java Wed May 25 15:31:30 2011
@@ -19,20 +19,26 @@ package org.apache.archiva.scheduler.rep
* under the License.
*/
+import junit.framework.TestCase;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepositoryException;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.metadata.repository.TestRepositorySessionFactory;
import org.apache.archiva.metadata.repository.stats.RepositoryStatistics;
import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.model.ArtifactReference;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.codehaus.plexus.util.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import javax.inject.Inject;
+import javax.inject.Named;
import java.io.File;
import java.util.Calendar;
import java.util.Collection;
@@ -46,39 +52,43 @@ import static org.mockito.Mockito.mock;
*
* @version $Id$
*/
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class ArchivaRepositoryScanningTaskExecutorTest
- extends PlexusInSpringTestCase
+ extends TestCase
{
+ @Inject
+ @Named( value = "taskExecutor#test-repository-scanning" )
private TaskExecutor taskExecutor;
- private File repoDir;
-
- private static final String TEST_REPO_ID = "testRepo";
+ @Inject @Named(value = "archivaConfiguration#test-repository-scanning")
+ private ArchivaConfiguration archivaConfig;
+ @Inject
private RepositoryStatisticsManager repositoryStatisticsManager;
+ @Inject
+ @Named( value = "knownRepositoryContentConsumer#test-consumer" )
private TestConsumer testConsumer;
+ @Inject
+ @Named( value = "repositorySessionFactory#test" )
+ private TestRepositorySessionFactory factory;
+
+ private File repoDir;
+
+ private static final String TEST_REPO_ID = "testRepo";
+
private MetadataRepository metadataRepository;
- protected void setUp()
+ @Before
+ public void setUp()
throws Exception
{
super.setUp();
- try
- {
- taskExecutor = (TaskExecutor) lookup( TaskExecutor.class, "test-repository-scanning" );
- }
- catch ( Exception e )
- {
- // TODO: handle cleanup in plexus-spring lookup method instead
- applicationContext.close();
- throw e;
- }
-
- File sourceRepoDir = new File( getBasedir(), "src/test/repositories/default-repository" );
- repoDir = new File( getBasedir(), "target/default-repository" );
+ File sourceRepoDir = new File( "./src/test/repositories/default-repository" );
+ repoDir = new File( "./target/default-repository" );
FileUtils.deleteDirectory( repoDir );
assertFalse( "Default Test Repository should not exist.", repoDir.exists() );
@@ -101,7 +111,6 @@ public class ArchivaRepositoryScanningTa
assertTrue( "Default Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() );
- ArchivaConfiguration archivaConfig = (ArchivaConfiguration) lookup( ArchivaConfiguration.class );
assertNotNull( archivaConfig );
// Create it
@@ -112,16 +121,13 @@ public class ArchivaRepositoryScanningTa
archivaConfig.getConfiguration().getManagedRepositories().clear();
archivaConfig.getConfiguration().addManagedRepository( repositoryConfiguration );
- repositoryStatisticsManager = (RepositoryStatisticsManager) lookup( RepositoryStatisticsManager.class );
- testConsumer = (TestConsumer) lookup( KnownRepositoryContentConsumer.class, "test-consumer" );
-
metadataRepository = mock( MetadataRepository.class );
- TestRepositorySessionFactory factory = (TestRepositorySessionFactory) lookup( RepositorySessionFactory.class );
factory.setRepository( metadataRepository );
}
- protected void tearDown()
+ @After
+ public void tearDown()
throws Exception
{
FileUtils.deleteDirectory( repoDir );
@@ -131,6 +137,7 @@ public class ArchivaRepositoryScanningTa
super.tearDown();
}
+ @Test
public void testExecutor()
throws Exception
{
@@ -146,6 +153,7 @@ public class ArchivaRepositoryScanningTa
assertEquals( "Incorrect number of unprocessed artifacts detected.", 8, unprocessedResultList.size() );
}
+ @Test
public void testExecutorScanOnlyNewArtifacts()
throws Exception
{
@@ -166,8 +174,8 @@ public class ArchivaRepositoryScanningTa
unprocessedResultList.size() );
// check correctness of new stats
- RepositoryStatistics newStats = repositoryStatisticsManager.getLastStatistics( metadataRepository,
- TEST_REPO_ID );
+ RepositoryStatistics newStats =
+ repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 0, newStats.getNewFileCount() );
assertEquals( 31, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
@@ -178,7 +186,7 @@ public class ArchivaRepositoryScanningTa
File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
- FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva" ),
+ FileUtils.copyDirectoryStructure( new File( "target/test-classes/test-repo/org/apache/archiva" ),
newArtifactGroup );
// update last modified date
@@ -198,8 +206,8 @@ public class ArchivaRepositoryScanningTa
unprocessedResultList.size() );
// check correctness of new stats
- RepositoryStatistics updatedStats = repositoryStatisticsManager.getLastStatistics( metadataRepository,
- TEST_REPO_ID );
+ RepositoryStatistics updatedStats =
+ repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, updatedStats.getNewFileCount() );
assertEquals( 33, updatedStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
@@ -209,6 +217,7 @@ public class ArchivaRepositoryScanningTa
// assertEquals( 19301, updatedStats.getTotalArtifactFileSize() );
}
+ @Test
public void testExecutorScanOnlyNewArtifactsChangeTimes()
throws Exception
{
@@ -221,7 +230,7 @@ public class ArchivaRepositoryScanningTa
File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
- FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva" ),
+ FileUtils.copyDirectoryStructure( new File( "target/test-classes/test-repo/org/apache/archiva" ),
newArtifactGroup );
// update last modified date, placing shortly after last scan
@@ -243,8 +252,8 @@ public class ArchivaRepositoryScanningTa
unprocessedResultList.size() );
// check correctness of new stats
- RepositoryStatistics newStats = repositoryStatisticsManager.getLastStatistics( metadataRepository,
- TEST_REPO_ID );
+ RepositoryStatistics newStats =
+ repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, newStats.getNewFileCount() );
assertEquals( 33, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
@@ -254,6 +263,7 @@ public class ArchivaRepositoryScanningTa
// assertEquals( 19301, newStats.getTotalArtifactFileSize() );
}
+ @Test
public void testExecutorScanOnlyNewArtifactsMidScan()
throws Exception
{
@@ -266,7 +276,7 @@ public class ArchivaRepositoryScanningTa
File newArtifactGroup = new File( repoDir, "org/apache/archiva" );
- FileUtils.copyDirectoryStructure( new File( getBasedir(), "target/test-classes/test-repo/org/apache/archiva" ),
+ FileUtils.copyDirectoryStructure( new File( "target/test-classes/test-repo/org/apache/archiva" ),
newArtifactGroup );
// update last modified date, placing in middle of last scan
@@ -288,8 +298,8 @@ public class ArchivaRepositoryScanningTa
unprocessedResultList.size() );
// check correctness of new stats
- RepositoryStatistics newStats = repositoryStatisticsManager.getLastStatistics( metadataRepository,
- TEST_REPO_ID );
+ RepositoryStatistics newStats =
+ repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, newStats.getNewFileCount() );
assertEquals( 33, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
@@ -299,6 +309,7 @@ public class ArchivaRepositoryScanningTa
// assertEquals( 19301, newStats.getTotalArtifactFileSize() );
}
+ @Test
public void testExecutorForceScanAll()
throws Exception
{
@@ -308,8 +319,8 @@ public class ArchivaRepositoryScanningTa
repoTask.setScanAll( true );
Date date = Calendar.getInstance().getTime();
- repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, new Date(
- date.getTime() - 1234567 ), date, 8, 8 );
+ repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID,
+ new Date( date.getTime() - 1234567 ), date, 8, 8 );
taskExecutor.executeTask( repoTask );
@@ -333,7 +344,7 @@ public class ArchivaRepositoryScanningTa
stats.setTotalProjectCount( 5 );
stats.setTotalArtifactFileSize( 38545 );
- repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, new Date(
- date.getTime() - 1234567 ), date, 31, 31 );
+ repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID,
+ new Date( date.getTime() - 1234567 ), date, 31, 31 );
}
}
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java Wed May 25 15:31:30 2011
@@ -19,13 +19,6 @@ package org.apache.archiva.scheduler.rep
* under the License.
*/
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.maven.archiva.consumers.ConsumerException;
@@ -35,14 +28,25 @@ import org.apache.maven.archiva.reposito
import org.apache.maven.archiva.repository.RepositoryContentFactory;
import org.apache.maven.archiva.repository.RepositoryException;
import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.springframework.stereotype.Service;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+@Service( "knownRepositoryContentConsumer#test-consumer" )
public class TestConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer
{
private Set<ArtifactReference> consumed = new HashSet<ArtifactReference>();
- // injected
+ @Inject
private RepositoryContentFactory factory;
private ManagedRepositoryContent repository;
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestRepositoryStatisticsManager.java Wed May 25 15:31:30 2011
@@ -22,6 +22,7 @@ package org.apache.archiva.scheduler.rep
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.stats.RepositoryStatistics;
import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
+import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
@@ -29,6 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+@Service("repositoryStatisticsManager#test")
public class TestRepositoryStatisticsManager
implements RepositoryStatisticsManager
{
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.xml Wed May 25 15:31:30 2011
@@ -29,6 +29,7 @@
<requirement>
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
<field-name>archivaConfiguration</field-name>
+ <role-hint>test-repository-scanning</role-hint>
</requirement>
<requirement>
<role>org.apache.archiva.repository.scanner.RepositoryScanner</role>
@@ -46,10 +47,11 @@
<component>
<role>org.apache.maven.archiva.configuration.ArchivaConfiguration</role>
<implementation>org.apache.maven.archiva.configuration.DefaultArchivaConfiguration</implementation>
+ <role-hint>test-repository-scanning</role-hint>
<requirements>
<requirement>
<role>org.codehaus.plexus.registry.Registry</role>
- <role-hint>configured</role-hint>
+ <role-hint>test-configured</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.archiva.policies.PreDownloadPolicy</role>
@@ -64,13 +66,17 @@
<component>
<role>org.codehaus.plexus.registry.Registry</role>
- <role-hint>configured</role-hint>
- <implementation>org.codehaus.plexus.registry.commons.CommonsConfigurationRegistry</implementation>
+ <role-hint>test-configured</role-hint>
+ <implementation>org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry</implementation>
<configuration>
<properties>
+ <![CDATA[
+ <configuration>
<system/>
<xml fileName="${basedir}/src/test/resources/archiva-test.xml"
config-name="org.apache.maven.archiva" config-at="org.apache.maven.archiva"/>
+ </configuration>
+ ]]>
</properties>
</configuration>
</component>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed May 25 15:31:30 2011
@@ -243,8 +243,8 @@
<artifactId>plexus-quartz</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-taskqueue</artifactId>
+ <groupId>org.codehaus.redback.components</groupId>
+ <artifactId>spring-taskqueue</artifactId>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1127555&r1=1127554&r2=1127555&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Wed May 25 15:31:30 2011
@@ -96,6 +96,7 @@
<exclude>net.sf.ehcache:ehcache</exclude>
<exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude>
<exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude>
+ <exclude>>org.codehaus.plexus:plexus-taskqueue</exclude>
</excludes>
</bannedDependencies>
</rules>
@@ -782,9 +783,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-taskqueue</artifactId>
- <version>1.0-alpha-8</version>
+ <groupId>org.codehaus.redback.components</groupId>
+ <artifactId>spring-taskqueue</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>