From: Olivier Lamy Date: Sat, 21 May 2011 17:57:38 +0000 (+0000) Subject: fix some spring bean name in archiva-policies X-Git-Tag: archiva-1.4-M1~779 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dc33d46ce9d4cf75f579fd6400c6f6a2ddb3d46b;p=archiva.git fix some spring bean name in archiva-policies move archiva-repository-scanner to full spring git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1125755 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java index ae8b735d6..3eb2797fb 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/CachedFailuresPolicy.java @@ -36,7 +36,7 @@ import javax.inject.Inject; * {@link PreDownloadPolicy} to check if the requested url has failed before. * * @version $Id$ - * @plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" + * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" * role-hint="cache-failures" */ @Service("preDownloadPolicy#cache-failures") @@ -58,7 +58,7 @@ public class CachedFailuresPolicy public static final String YES = "yes"; /** - * @plexus.requirement + * plexus.requirement */ @Inject private UrlFailureCache urlFailureCache; diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java index 5fcea2440..dcbeb5429 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ChecksumPolicy.java @@ -37,7 +37,7 @@ import org.springframework.stereotype.Service; * * @version $Id$ * - * @plexus.component role="org.apache.maven.archiva.policies.PostDownloadPolicy" + * plexus.component role="org.apache.maven.archiva.policies.PostDownloadPolicy" * role-hint="checksum" */ @Service("postDownloadPolicy#checksum") diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java index 47e18173b..be090edc2 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsDownloadPolicy.java @@ -33,7 +33,7 @@ import org.springframework.stereotype.Service; /** * PropagateErrorsPolicy - a policy applied on error to determine how to treat the error. * - * @plexus.component role="org.apache.maven.archiva.policies.DownloadErrorPolicy" + * plexus.component role="org.apache.maven.archiva.policies.DownloadErrorPolicy" * role-hint="propagate-errors" */ @Service("downloadErrorPolicy#propagate-errors") diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java index bbceee338..0ea898376 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java @@ -31,7 +31,7 @@ import org.springframework.stereotype.Service; /** * PropagateErrorsPolicy - a policy applied on error to determine how to treat the error. * - * @plexus.component role="org.apache.maven.archiva.policies.DownloadErrorPolicy" + * plexus.component role="org.apache.maven.archiva.policies.DownloadErrorPolicy" * role-hint="propagate-errors-on-update" */ @Service("downloadErrorPolicy#propagate-errors-on-update") diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java index 75bb82e72..357407516 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/ReleasesPolicy.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; * * @version $Id$ * - * @plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" + * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" * role-hint="releases" */ @Service("preDownloadPolicy#releases") diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java index a8e3863f3..16b9a8eac 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/maven/archiva/policies/SnapshotsPolicy.java @@ -27,7 +27,7 @@ import org.springframework.stereotype.Service; * * @version $Id$ * - * @plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" + * plexus.component role="org.apache.maven.archiva.policies.PreDownloadPolicy" * role-hint="snapshots" */ @Service("preDownloadPolicy#snapshots") diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml index d8c6fcb90..4a873d9f7 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -40,11 +40,6 @@ org.springframework spring-context - - org.codehaus.redback.components - plexus-spring - test - org.slf4j slf4j-simple diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java index d6b96fcad..a6d39c0f4 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java @@ -32,26 +32,31 @@ import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.maven.archiva.consumers.RepositoryContentConsumer; import org.codehaus.plexus.util.DirectoryWalker; +import org.springframework.stereotype.Service; +import javax.inject.Inject; import javax.swing.*; /** * DefaultRepositoryScanner * * @version $Id$ - * @plexus.component role="org.apache.archiva.repository.scanner.RepositoryScanner" + * plexus.component role="org.apache.archiva.repository.scanner.RepositoryScanner" */ +@Service("repositoryScanner#default") public class DefaultRepositoryScanner implements RepositoryScanner { /** - * @plexus.requirement + * plexus.requirement */ + @Inject private FileTypes filetypes; /** - * @plexus.requirement + * plexus.requirement */ + @Inject private RepositoryContentConsumers consumerUtil; private Set inProgressScans = new LinkedHashSet(); diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java index 5b1e30a5d..666ff0045 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java @@ -19,13 +19,6 @@ package org.apache.archiva.repository.scanner; * under the License. */ -import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure; import org.apache.archiva.repository.scanner.functors.TriggerBeginScanClosure; import org.apache.archiva.repository.scanner.functors.TriggerScanCompletedClosure; @@ -43,27 +36,35 @@ import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; +import java.io.File; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** - * RepositoryContentConsumerUtil + * RepositoryContentConsumerUtil * * @version $Id$ */ -public class RepositoryContentConsumers implements ApplicationContextAware +public class RepositoryContentConsumers + implements ApplicationContextAware { private ApplicationContext applicationContext; - + private ArchivaConfiguration archivaConfiguration; private List selectedKnownConsumers; private List selectedInvalidConsumers; - public RepositoryContentConsumers(ArchivaConfiguration archivaConfiguration) + public RepositoryContentConsumers( ArchivaConfiguration archivaConfiguration ) { this.archivaConfiguration = archivaConfiguration; } - public void setApplicationContext(ApplicationContext applicationContext) + public void setApplicationContext( ApplicationContext applicationContext ) throws BeansException { this.applicationContext = applicationContext; @@ -74,12 +75,12 @@ public class RepositoryContentConsumers implements ApplicationContextAware * Get the list of Ids associated with those {@link KnownRepositoryContentConsumer} that have * been selected in the configuration to execute. *

- * + *

*

* NOTE: This list can be larger and contain entries that might not exist or be available * in the classpath, or as a component. *

- * + * * @return the list of consumer ids that have been selected by the configuration. */ public List getSelectedKnownConsumerIds() @@ -93,12 +94,12 @@ public class RepositoryContentConsumers implements ApplicationContextAware * Get the list of Ids associated with those {@link InvalidRepositoryContentConsumer} that have * been selected in the configuration to execute. *

- * + *

*

* NOTE: This list can be larger and contain entries that might not exist or be available * in the classpath, or as a component. *

- * + * * @return the list of consumer ids that have been selected by the configuration. */ public List getSelectedInvalidConsumerIds() @@ -109,8 +110,8 @@ public class RepositoryContentConsumers implements ApplicationContextAware /** * Get the map of {@link String} ids to {@link KnownRepositoryContentConsumer} implementations, - * for those consumers that have been selected according to the active configuration. - * + * for those consumers that have been selected according to the active configuration. + * * @return the map of String ids to {@link KnownRepositoryContentConsumer} objects. */ public Map getSelectedKnownConsumersMap() @@ -127,13 +128,14 @@ public class RepositoryContentConsumers implements ApplicationContextAware /** * Get the map of {@link String} ids to {@link InvalidRepositoryContentConsumer} implementations, - * for those consumers that have been selected according to the active configuration. - * + * for those consumers that have been selected according to the active configuration. + * * @return the map of String ids to {@link InvalidRepositoryContentConsumer} objects. */ public Map getSelectedInvalidConsumersMap() { - Map consumerMap = new HashMap(); + Map consumerMap = + new HashMap(); for ( InvalidRepositoryContentConsumer consumer : getSelectedInvalidConsumers() ) { @@ -146,7 +148,7 @@ public class RepositoryContentConsumers implements ApplicationContextAware /** * Get the list of {@link KnownRepositoryContentConsumer} objects that are * selected according to the active configuration. - * + * * @return the list of {@link KnownRepositoryContentConsumer} that have been selected * by the active configuration. */ @@ -173,7 +175,7 @@ public class RepositoryContentConsumers implements ApplicationContextAware /** * Get the list of {@link InvalidRepositoryContentConsumer} objects that are * selected according to the active configuration. - * + * * @return the list of {@link InvalidRepositoryContentConsumer} that have been selected * by the active configuration. */ @@ -200,58 +202,61 @@ public class RepositoryContentConsumers implements ApplicationContextAware /** * Get the list of {@link KnownRepositoryContentConsumer} objects that are * available and present in the classpath and as components in the IoC. - * - * @return the list of all available {@link KnownRepositoryContentConsumer} present in the classpath + * + * @return the list of all available {@link KnownRepositoryContentConsumer} present in the classpath * and as a component in the IoC. */ public List getAvailableKnownConsumers() { - return new ArrayList( applicationContext.getBeansOfType( KnownRepositoryContentConsumer.class ).values() ); + return new ArrayList( + applicationContext.getBeansOfType( KnownRepositoryContentConsumer.class ).values() ); } /** * Get the list of {@link InvalidRepositoryContentConsumer} objects that are * available and present in the classpath and as components in the IoC. - * - * @return the list of all available {@link InvalidRepositoryContentConsumer} present in the classpath + * + * @return the list of all available {@link InvalidRepositoryContentConsumer} present in the classpath * and as a component in the IoC. */ public List getAvailableInvalidConsumers() { - return new ArrayList( applicationContext.getBeansOfType( InvalidRepositoryContentConsumer.class ).values() ); + return new ArrayList( + applicationContext.getBeansOfType( InvalidRepositoryContentConsumer.class ).values() ); } /** - * A convienence method to execute all of the active selected consumers for a + * A convienence method to execute all of the active selected consumers for a * particular arbitrary file. * NOTE: Make sure that there is no repository scanning task executing before invoking this so as to prevent * the index writer/reader of the current index-content consumer executing from getting closed. For an example, * see ArchivaDavResource#executeConsumers( File ). - * - * @param repository the repository configuration to use. - * @param localFile the local file to execute the consumers against. + * + * @param repository the repository configuration to use. + * @param localFile the local file to execute the consumers against. * @param updateRelatedArtifacts TODO */ - public void executeConsumers( ManagedRepositoryConfiguration repository, File localFile, boolean updateRelatedArtifacts ) + public void executeConsumers( ManagedRepositoryConfiguration repository, File localFile, + boolean updateRelatedArtifacts ) { // Run the repository consumers try - { + { Closure triggerBeginScan = new TriggerBeginScanClosure( repository, getStartTime(), false ); List selectedKnownConsumers = getSelectedKnownConsumers(); // MRM-1212/MRM-1197 // - do not create missing/fix invalid checksums and update metadata when deploying from webdav since these are uploaded by maven - if( updateRelatedArtifacts == false ) + if ( updateRelatedArtifacts == false ) { List clone = new ArrayList(); clone.addAll( selectedKnownConsumers ); - for( KnownRepositoryContentConsumer consumer : clone ) + for ( KnownRepositoryContentConsumer consumer : clone ) { - if( consumer.getId().equals( "create-missing-checksums" ) || - consumer.getId().equals( "metadata-updater" ) ) + if ( consumer.getId().equals( "create-missing-checksums" ) || consumer.getId().equals( + "metadata-updater" ) ) { selectedKnownConsumers.remove( consumer ); } @@ -272,7 +277,7 @@ public class RepositoryContentConsumers implements ApplicationContextAware ConsumerProcessFileClosure closure = new ConsumerProcessFileClosure(); closure.setBasefile( baseFile ); closure.setExecuteOnEntireRepo( false ); - + Closure processIfWanted = IfClosure.getInstance( predicate, closure ); CollectionUtils.forAllDo( selectedKnownConsumers, processIfWanted ); @@ -305,12 +310,12 @@ public class RepositoryContentConsumers implements ApplicationContextAware { this.selectedInvalidConsumers = selectedInvalidConsumers; } - + protected Date getStartTime() - { + { return new Date( System.currentTimeMillis() ); } - + public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration ) { this.archivaConfiguration = archivaConfiguration; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml index f8bce47bc..867eb1a27 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml @@ -1,11 +1,39 @@ - + + + + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd" + default-lazy-init="true"> + + + + - - - - - + + + + + diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java index ab5879ae6..aaeb03197 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/InvalidScanConsumer.java @@ -37,7 +37,7 @@ public class InvalidScanConsumer implements InvalidRepositoryContentConsumer { /** - * @plexus.configuration default-value="unset-id" + * plexus.configuration default-value="unset-id" */ private String id = "unset-id"; @@ -111,4 +111,9 @@ public class InvalidScanConsumer { this.processCount = processCount; } + + public void setId( String id ) + { + this.id = id; + } } diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java index 4e25a18a1..d95d97b2f 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.java @@ -19,25 +19,16 @@ package org.apache.archiva.repository.scanner; * under the License. */ -import java.io.File; -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - +import junit.framework.TestCase; import org.apache.commons.lang.SystemUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; -import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.easymock.MockControl; +import org.junit.Test; +import org.junit.runner.RunWith; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -47,24 +38,34 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.MessageSourceResolvable; import org.springframework.context.NoSuchMessageException; import org.springframework.core.io.Resource; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import javax.inject.Inject; +import java.io.File; +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; /** * RepositoryContentConsumersTest * * @version $Id$ */ +@RunWith( SpringJUnit4ClassRunner.class ) +@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } ) public class RepositoryContentConsumersTest - extends PlexusInSpringTestCase + extends TestCase { - /** - * {@inheritDoc} - * @see org.codehaus.plexus.spring.PlexusInSpringTestCase#getSpringConfigLocation() - */ - @Override - protected String getSpringConfigLocation() - { - return "org/apache/maven/archiva/repository/spring-context.xml"; - } + + @Inject + ApplicationContext applicationContext; protected ManagedRepositoryConfiguration createRepository( String id, String name, File location ) { @@ -87,42 +88,43 @@ public class RepositoryContentConsumersTest private RepositoryContentConsumers lookupRepositoryConsumers() throws Exception { - ArchivaConfiguration configuration = (ArchivaConfiguration)lookup(ArchivaConfiguration.class); - RepositoryContentConsumers consumerUtilStub = new RepositoryContentConsumersStub(configuration); - - RepositoryContentConsumers consumerUtil = (RepositoryContentConsumers) lookup( RepositoryContentConsumers.class - .getName() ); - ApplicationContext context = new MockApplicationContext(consumerUtil.getAvailableKnownConsumers(), consumerUtil.getAvailableInvalidConsumers()); + ArchivaConfiguration configuration = + applicationContext.getBean( "archivaConfiguration#test-conf", ArchivaConfiguration.class ); + + RepositoryContentConsumers consumerUtilStub = new RepositoryContentConsumersStub( configuration ); - consumerUtilStub.setApplicationContext(context); + RepositoryContentConsumers consumerUtil = + (RepositoryContentConsumers) applicationContext.getBean( "repositoryContentConsumers#test", + RepositoryContentConsumers.class ); + ApplicationContext context = new MockApplicationContext( consumerUtil.getAvailableKnownConsumers(), + consumerUtil.getAvailableInvalidConsumers() ); + + consumerUtilStub.setApplicationContext( context ); consumerUtilStub.setSelectedInvalidConsumers( consumerUtil.getSelectedInvalidConsumers() ); - consumerUtilStub.setSelectedKnownConsumers( consumerUtil.getSelectedKnownConsumers() ); + consumerUtilStub.setSelectedKnownConsumers( consumerUtil.getSelectedKnownConsumers() ); consumerUtilStub.setArchivaConfiguration( configuration ); - + assertNotNull( "RepositoryContentConsumers should not be null.", consumerUtilStub ); - + return consumerUtilStub; } + @Test public void testGetSelectedKnownIds() throws Exception { RepositoryContentConsumers consumerutil = lookupRepositoryConsumers(); - String expectedKnownIds[] = new String[] { - "update-db-artifact", - "create-missing-checksums", - "update-db-repository-metadata", - "validate-checksum", - "validate-signature", - "index-content", - "auto-remove", - "auto-rename" }; - + String expectedKnownIds[] = + new String[]{ "update-db-artifact", "create-missing-checksums", "update-db-repository-metadata", + "validate-checksum", "validate-signature", "index-content", "auto-remove", "auto-rename" }; +//update-db-artifact, create-missing-checksums, update-db-repository-metadata, +//validate-checksum, validate-signature, index-content, auto-remove, auto-rename, +//metadata-updater List knownConsumers = consumerutil.getSelectedKnownConsumerIds(); assertNotNull( "Known Consumer IDs should not be null", knownConsumers ); - assertEquals( "Known Consumer IDs.size", expectedKnownIds.length, knownConsumers.size() ); + assertEquals( "Known Consumer IDs.size " + knownConsumers, expectedKnownIds.length, knownConsumers.size() ); for ( String expectedId : expectedKnownIds ) { @@ -130,12 +132,13 @@ public class RepositoryContentConsumersTest } } + @Test public void testGetSelectedInvalidIds() throws Exception { RepositoryContentConsumers consumerutil = lookupRepositoryConsumers(); - String expectedInvalidIds[] = new String[] { "update-db-bad-content" }; + String expectedInvalidIds[] = new String[]{ "update-db-bad-content" }; List invalidConsumers = consumerutil.getSelectedInvalidConsumerIds(); assertNotNull( "Invalid Consumer IDs should not be null", invalidConsumers ); @@ -147,19 +150,15 @@ public class RepositoryContentConsumersTest } } + @Test public void testGetSelectedKnownConsumerMap() throws Exception { RepositoryContentConsumers consumerutil = lookupRepositoryConsumers(); - String expectedSelectedKnownIds[] = new String[] { - "update-db-artifact", - "create-missing-checksums", - "update-db-repository-metadata", - "validate-checksum", - "index-content", - "auto-remove", - "auto-rename" }; + String expectedSelectedKnownIds[] = + new String[]{ "update-db-artifact", "create-missing-checksums", "update-db-repository-metadata", + "validate-checksum", "index-content", "auto-remove", "auto-rename" }; Map knownConsumerMap = consumerutil.getSelectedKnownConsumersMap(); assertNotNull( "Known Consumer Map should not be null", knownConsumerMap ); @@ -173,15 +172,16 @@ public class RepositoryContentConsumersTest } } + @Test public void testGetSelectedInvalidConsumerMap() throws Exception { RepositoryContentConsumers consumerutil = lookupRepositoryConsumers(); - String expectedSelectedInvalidIds[] = new String[] { "update-db-bad-content" }; + String expectedSelectedInvalidIds[] = new String[]{ "update-db-bad-content" }; - Map invalidConsumerMap = consumerutil - .getSelectedInvalidConsumersMap(); + Map invalidConsumerMap = + consumerutil.getSelectedInvalidConsumersMap(); assertNotNull( "Invalid Consumer Map should not be null", invalidConsumerMap ); assertEquals( "Invalid Consumer Map.size", expectedSelectedInvalidIds.length, invalidConsumerMap.size() ); @@ -193,20 +193,15 @@ public class RepositoryContentConsumersTest } } + @Test public void testGetAvailableKnownList() throws Exception { RepositoryContentConsumers consumerutil = lookupRepositoryConsumers(); - String expectedKnownIds[] = new String[] { - "update-db-artifact", - "create-missing-checksums", - "update-db-repository-metadata", - "validate-checksum", - "index-content", - "auto-remove", - "auto-rename", - "available-but-unselected" }; + String expectedKnownIds[] = + new String[]{ "update-db-artifact", "create-missing-checksums", "update-db-repository-metadata", + "validate-checksum", "index-content", "auto-remove", "auto-rename", "available-but-unselected" }; List knownConsumers = consumerutil.getAvailableKnownConsumers(); assertNotNull( "known consumers should not be null.", knownConsumers ); @@ -220,12 +215,13 @@ public class RepositoryContentConsumersTest } } + @Test public void testGetAvailableInvalidList() throws Exception { RepositoryContentConsumers consumerutil = lookupRepositoryConsumers(); - String expectedInvalidIds[] = new String[] { "update-db-bad-content", "move-to-trash-then-notify" }; + String expectedInvalidIds[] = new String[]{ "update-db-bad-content", "move-to-trash-then-notify" }; List invalidConsumers = consumerutil.getAvailableInvalidConsumers(); assertNotNull( "invalid consumers should not be null.", invalidConsumers ); @@ -234,12 +230,13 @@ public class RepositoryContentConsumersTest List expectedIds = Arrays.asList( expectedInvalidIds ); for ( InvalidRepositoryContentConsumer consumer : invalidConsumers ) { - assertTrue( "Consumer [" + consumer.getId() - + "] returned by .getAvailableInvalidConsumers() is unexpected.", expectedIds.contains( consumer - .getId() ) ); + assertTrue( + "Consumer [" + consumer.getId() + "] returned by .getAvailableInvalidConsumers() is unexpected.", + expectedIds.contains( consumer.getId() ) ); } } + @Test public void testExecution() throws Exception { @@ -250,7 +247,8 @@ public class RepositoryContentConsumersTest (KnownRepositoryContentConsumer) MockControl.createNiceControl( KnownRepositoryContentConsumer.class ).getMock(); - consumers.setApplicationContext(new MockApplicationContext(Arrays.asList( selectedKnownConsumer, unselectedKnownConsumer ), null)); + consumers.setApplicationContext( + new MockApplicationContext( Arrays.asList( selectedKnownConsumer, unselectedKnownConsumer ), null ) ); consumers.setSelectedKnownConsumers( Collections.singletonList( selectedKnownConsumer ) ); @@ -261,12 +259,13 @@ public class RepositoryContentConsumersTest (InvalidRepositoryContentConsumer) MockControl.createControl( InvalidRepositoryContentConsumer.class ).getMock(); - consumers.setApplicationContext( new MockApplicationContext(null, Arrays.asList( selectedInvalidConsumer, unselectedInvalidConsumer ))); + consumers.setApplicationContext( + new MockApplicationContext( null, Arrays.asList( selectedInvalidConsumer, unselectedInvalidConsumer ) ) ); consumers.setSelectedInvalidConsumers( Collections.singletonList( selectedInvalidConsumer ) ); - ManagedRepositoryConfiguration repo = createRepository( "id", "name", getTestFile( "target/test-repo" ) ); - File testFile = getTestFile( "target/test-repo/path/to/test-file.txt" ); + ManagedRepositoryConfiguration repo = createRepository( "id", "name", new File( "target/test-repo" ) ); + File testFile = new File( "target/test-repo/path/to/test-file.txt" ); Date startTime = new Date( System.currentTimeMillis() ); startTime.setTime( 12345678 ); @@ -292,7 +291,7 @@ public class RepositoryContentConsumersTest knownControl.reset(); invalidControl.reset(); - File notIncludedTestFile = getTestFile( "target/test-repo/path/to/test-file.xml" ); + File notIncludedTestFile = new File( "./target/test-repo/path/to/test-file.xml" ); selectedKnownConsumer.beginScan( repo, startTime, false ); selectedKnownConsumer.getExcludes(); @@ -317,7 +316,7 @@ public class RepositoryContentConsumersTest knownControl.reset(); invalidControl.reset(); - File excludedTestFile = getTestFile( "target/test-repo/path/to/test-file.txt" ); + File excludedTestFile = new File( "target/test-repo/path/to/test-file.txt" ); selectedKnownConsumer.beginScan( repo, startTime, false ); selectedKnownConsumer.getExcludes(); @@ -351,171 +350,216 @@ public class RepositoryContentConsumersTest return path; } - private static Map convertToMap(List objects) + private static Map convertToMap( List objects ) { HashMap map = new HashMap(); - for (Object o : objects) + for ( Object o : objects ) { - map.put(o, o); + map.put( o, o ); } return map; } - public class MockApplicationContext implements ApplicationContext + public class MockApplicationContext + implements ApplicationContext { private List knownRepositoryContentConsumer; private List invalidRepositoryContentConsumers; - public MockApplicationContext(List knownRepositoryContentConsumer, List invalidRepositoryContentConsumers) + public MockApplicationContext( List knownRepositoryContentConsumer, + List invalidRepositoryContentConsumers ) { this.knownRepositoryContentConsumer = knownRepositoryContentConsumer; this.invalidRepositoryContentConsumers = invalidRepositoryContentConsumers; } - public AutowireCapableBeanFactory getAutowireCapableBeanFactory() throws IllegalStateException { - throw new UnsupportedOperationException("Not supported yet."); + public AutowireCapableBeanFactory getAutowireCapableBeanFactory() + throws IllegalStateException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String getDisplayName() { - throw new UnsupportedOperationException("Not supported yet."); + public String getDisplayName() + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String getId() { - throw new UnsupportedOperationException("Not supported yet."); + public String getId() + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public ApplicationContext getParent() { - throw new UnsupportedOperationException("Not supported yet."); + public ApplicationContext getParent() + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public long getStartupDate() { - throw new UnsupportedOperationException("Not supported yet."); + public long getStartupDate() + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public boolean containsBeanDefinition(String beanName) { - throw new UnsupportedOperationException("Not supported yet."); + public boolean containsBeanDefinition( String beanName ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public int getBeanDefinitionCount() { - throw new UnsupportedOperationException("Not supported yet."); + public int getBeanDefinitionCount() + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String[] getBeanDefinitionNames() { - throw new UnsupportedOperationException("Not supported yet."); + public String[] getBeanDefinitionNames() + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String[] getBeanNamesForType(Class type) { - throw new UnsupportedOperationException("Not supported yet."); + public String[] getBeanNamesForType( Class type ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String[] getBeanNamesForType(Class type, boolean includeNonSingletons, boolean allowEagerInit) { - throw new UnsupportedOperationException("Not supported yet."); + public String[] getBeanNamesForType( Class type, boolean includeNonSingletons, boolean allowEagerInit ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public Map getBeansOfType(Class type) throws BeansException { - if (type == KnownRepositoryContentConsumer.class) + public Map getBeansOfType( Class type ) + throws BeansException + { + if ( type == KnownRepositoryContentConsumer.class ) { - return convertToMap(knownRepositoryContentConsumer); + return convertToMap( knownRepositoryContentConsumer ); } - if (type == InvalidRepositoryContentConsumer.class) + if ( type == InvalidRepositoryContentConsumer.class ) { - return convertToMap(invalidRepositoryContentConsumers); + return convertToMap( invalidRepositoryContentConsumers ); } - throw new UnsupportedOperationException("Should not have been called"); + throw new UnsupportedOperationException( "Should not have been called" ); } - public Map getBeansOfType(Class type, boolean includeNonSingletons, boolean allowEagerInit) throws BeansException { - throw new UnsupportedOperationException("Not supported yet."); + public Map getBeansOfType( Class type, boolean includeNonSingletons, boolean allowEagerInit ) + throws BeansException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public boolean containsBean(String name) { - throw new UnsupportedOperationException("Not supported yet."); + public boolean containsBean( String name ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String[] getAliases(String name) { - throw new UnsupportedOperationException("Not supported yet."); + public String[] getAliases( String name ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public Object getBean(String name) throws BeansException { - throw new UnsupportedOperationException("Not supported yet."); + public Object getBean( String name ) + throws BeansException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public Object getBean(String name, Class requiredType) throws BeansException { - throw new UnsupportedOperationException("Not supported yet."); + public Object getBean( String name, Class requiredType ) + throws BeansException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public Object getBean(String name, Object[] args) throws BeansException { - throw new UnsupportedOperationException("Not supported yet."); + public Object getBean( String name, Object[] args ) + throws BeansException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public Class getType(String name) throws NoSuchBeanDefinitionException { - throw new UnsupportedOperationException("Not supported yet."); + public Class getType( String name ) + throws NoSuchBeanDefinitionException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public boolean isPrototype(String name) throws NoSuchBeanDefinitionException { - throw new UnsupportedOperationException("Not supported yet."); + public boolean isPrototype( String name ) + throws NoSuchBeanDefinitionException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public boolean isSingleton(String name) throws NoSuchBeanDefinitionException { - throw new UnsupportedOperationException("Not supported yet."); + public boolean isSingleton( String name ) + throws NoSuchBeanDefinitionException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public boolean isTypeMatch(String name, Class targetType) throws NoSuchBeanDefinitionException { - throw new UnsupportedOperationException("Not supported yet."); + public boolean isTypeMatch( String name, Class targetType ) + throws NoSuchBeanDefinitionException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public boolean containsLocalBean(String name) { - throw new UnsupportedOperationException("Not supported yet."); + public boolean containsLocalBean( String name ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public BeanFactory getParentBeanFactory() { - throw new UnsupportedOperationException("Not supported yet."); + public BeanFactory getParentBeanFactory() + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) { - throw new UnsupportedOperationException("Not supported yet."); + public String getMessage( String code, Object[] args, String defaultMessage, Locale locale ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException { - throw new UnsupportedOperationException("Not supported yet."); + public String getMessage( String code, Object[] args, Locale locale ) + throws NoSuchMessageException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException { - throw new UnsupportedOperationException("Not supported yet."); + public String getMessage( MessageSourceResolvable resolvable, Locale locale ) + throws NoSuchMessageException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public void publishEvent(ApplicationEvent event) { - throw new UnsupportedOperationException("Not supported yet."); + public void publishEvent( ApplicationEvent event ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public Resource[] getResources(String locationPattern) throws IOException { - throw new UnsupportedOperationException("Not supported yet."); + public Resource[] getResources( String locationPattern ) + throws IOException + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public ClassLoader getClassLoader() { - throw new UnsupportedOperationException("Not supported yet."); + public ClassLoader getClassLoader() + { + throw new UnsupportedOperationException( "Not supported yet." ); } - public Resource getResource(String location) { - throw new UnsupportedOperationException("Not supported yet."); + public Resource getResource( String location ) + { + throw new UnsupportedOperationException( "Not supported yet." ); } public T getBean( Class tClass ) throws BeansException { - throw new UnsupportedOperationException("Not supported yet."); + throw new UnsupportedOperationException( "Not supported yet." ); } public Map getBeansWithAnnotation( Class aClass ) throws BeansException { - throw new UnsupportedOperationException("Not supported yet."); + throw new UnsupportedOperationException( "Not supported yet." ); } public A findAnnotationOnBean( String s, Class aClass ) { - throw new UnsupportedOperationException("Not supported yet."); + throw new UnsupportedOperationException( "Not supported yet." ); } } } diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java index 2f8c6408e..709128e60 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/RepositoryScannerTest.java @@ -19,6 +19,19 @@ package org.apache.archiva.repository.scanner; * under the License. */ +import junit.framework.TestCase; +import org.apache.commons.io.FileUtils; +import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer; +import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import javax.inject.Inject; import java.io.File; import java.io.IOException; import java.text.ParseException; @@ -29,30 +42,19 @@ import java.util.List; import java.util.Locale; import java.util.TimeZone; -import org.apache.commons.io.FileUtils; -import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer; -import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; -import org.codehaus.plexus.spring.PlexusInSpringTestCase; - /** * RepositoryScannerTest * * @version $Id$ */ +@RunWith( SpringJUnit4ClassRunner.class ) +@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml" } ) public class RepositoryScannerTest - extends PlexusInSpringTestCase + extends TestCase { - /** - * {@inheritDoc} - * @see org.codehaus.plexus.spring.PlexusInSpringTestCase#getSpringConfigLocation() - */ - @Override - protected String getSpringConfigLocation() - { - return "org/apache/maven/archiva/repository/spring-context.xml"; - } + + @Inject + ApplicationContext applicationContext; protected ManagedRepositoryConfiguration createRepository( String id, String name, File location ) { @@ -73,11 +75,11 @@ public class RepositoryScannerTest } private static final String[] ARTIFACT_PATTERNS = - new String[]{"**/*.jar", "**/*.pom", "**/*.rar", "**/*.zip", "**/*.war", "**/*.tar.gz"}; + new String[]{ "**/*.jar", "**/*.pom", "**/*.rar", "**/*.zip", "**/*.war", "**/*.tar.gz" }; private ManagedRepositoryConfiguration createDefaultRepository() { - File repoDir = new File( getBasedir(), "src/test/repositories/default-repository" ); + File repoDir = new File( "src/test/repositories/default-repository" ); assertTrue( "Default Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() ); @@ -87,9 +89,9 @@ public class RepositoryScannerTest private ManagedRepositoryConfiguration createSimpleRepository() throws IOException, ParseException { - File srcDir = new File( getBasedir(), "src/test/repositories/simple-repository" ); + File srcDir = new File( "src/test/repositories/simple-repository" ); - File repoDir = getTestFile( "target/test-repos/simple-repository" ); + File repoDir = new File( "target/test-repos/simple-repository" ); FileUtils.deleteDirectory( repoDir ); @@ -114,7 +116,7 @@ public class RepositoryScannerTest private ManagedRepositoryConfiguration createLegacyRepository() { - File repoDir = new File( getBasedir(), "src/test/repositories/legacy-repository" ); + File repoDir = new File( "src/test/repositories/legacy-repository" ); assertTrue( "Legacy Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() ); @@ -128,15 +130,15 @@ public class RepositoryScannerTest { if ( actualCount < minimumHitCount ) { - fail( "Minimum hit count on " + msg + " not satisfied. Expected more than <" + minimumHitCount + - ">, but actually got <" + actualCount + ">." ); + fail( "Minimum hit count on " + msg + " not satisfied. Expected more than <" + minimumHitCount + + ">, but actually got <" + actualCount + ">." ); } } private RepositoryScanner lookupRepositoryScanner() throws Exception { - return (RepositoryScanner) lookup( RepositoryScanner.class ); + return applicationContext.getBean( RepositoryScanner.class ); } private List getIgnoreList() @@ -146,6 +148,7 @@ public class RepositoryScannerTest return ignores; } + @Test public void testTimestampRepositoryScanner() throws Exception { @@ -163,7 +166,7 @@ public class RepositoryScannerTest RepositoryScanner scanner = lookupRepositoryScanner(); RepositoryScanStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), - getTimestampAsMillis( "20061101.000000" ) ); + getTimestampAsMillis( "20061101.000000" ) ); assertNotNull( "Stats should not be null.", stats ); assertEquals( "Stats.totalFileCount", 4, stats.getTotalFileCount() ); @@ -172,6 +175,7 @@ public class RepositoryScannerTest assertEquals( "Processed Count (of invalid items)", 1, badconsumer.getProcessCount() ); } + @Test public void testTimestampRepositoryScannerFreshScan() throws Exception { @@ -197,6 +201,7 @@ public class RepositoryScannerTest assertEquals( "Processed Count (of invalid items)", 1, badconsumer.getProcessCount() ); } + @Test public void testTimestampRepositoryScannerProcessUnmodified() throws Exception { @@ -214,7 +219,7 @@ public class RepositoryScannerTest RepositoryScanner scanner = lookupRepositoryScanner(); RepositoryScanStatistics stats = scanner.scan( repository, knownConsumers, invalidConsumers, getIgnoreList(), - getTimestampAsMillis( "20061101.000000" ) ); + getTimestampAsMillis( "20061101.000000" ) ); assertNotNull( "Stats should not be null.", stats ); assertEquals( "Stats.totalFileCount", 4, stats.getTotalFileCount() ); @@ -223,6 +228,7 @@ public class RepositoryScannerTest assertEquals( "Processed Count (of invalid items)", 1, badconsumer.getProcessCount() ); } + @Test public void testDefaultRepositoryScanner() throws Exception { @@ -230,8 +236,9 @@ public class RepositoryScannerTest List knownConsumers = new ArrayList(); KnownScanConsumer consumer = new KnownScanConsumer(); - consumer.setIncludes( new String[]{"**/*.jar", "**/*.war", "**/*.pom", "**/maven-metadata.xml", "**/*-site.xml", - "**/*.zip", "**/*.tar.gz", "**/*.sha1", "**/*.md5"} ); + consumer.setIncludes( + new String[]{ "**/*.jar", "**/*.war", "**/*.pom", "**/maven-metadata.xml", "**/*-site.xml", "**/*.zip", + "**/*.tar.gz", "**/*.sha1", "**/*.md5" } ); knownConsumers.add( consumer ); List invalidConsumers = new ArrayList(); @@ -248,6 +255,7 @@ public class RepositoryScannerTest assertEquals( "Processed Count (of invalid items)", 6, badconsumer.getProcessCount() ); } + @Test public void testDefaultRepositoryArtifactScanner() throws Exception { @@ -305,6 +313,7 @@ public class RepositoryScannerTest assertMinimumHits( "Processed Count", actualArtifactPaths.size(), consumer.getProcessCount() ); } + @Test public void testDefaultRepositoryMetadataScanner() throws Exception { @@ -325,7 +334,7 @@ public class RepositoryScannerTest List knownConsumers = new ArrayList(); KnownScanConsumer knownConsumer = new KnownScanConsumer(); - knownConsumer.setIncludes( new String[]{"**/maven-metadata*.xml"} ); + knownConsumer.setIncludes( new String[]{ "**/maven-metadata*.xml" } ); knownConsumers.add( knownConsumer ); List invalidConsumers = new ArrayList(); @@ -341,6 +350,7 @@ public class RepositoryScannerTest assertMinimumHits( "Processed Count", actualMetadataPaths.size(), knownConsumer.getProcessCount() ); } + @Test public void testDefaultRepositoryProjectScanner() throws Exception { @@ -361,7 +371,7 @@ public class RepositoryScannerTest List knownConsumers = new ArrayList(); KnownScanConsumer consumer = new KnownScanConsumer(); - consumer.setIncludes( new String[]{"**/*.pom"} ); + consumer.setIncludes( new String[]{ "**/*.pom" } ); knownConsumers.add( consumer ); List invalidConsumers = new ArrayList(); @@ -377,6 +387,7 @@ public class RepositoryScannerTest assertMinimumHits( "Processed Count", actualProjectPaths.size(), consumer.getProcessCount() ); } + @Test public void testLegacyRepositoryArtifactScanner() throws Exception { diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java index 086f0436f..874567d59 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/SampleKnownConsumer.java @@ -32,7 +32,7 @@ import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer; * * @version $Id$ * - * @plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" + * plexus.component role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer" * role-hint="sample-known" */ public class SampleKnownConsumer @@ -40,7 +40,7 @@ public class SampleKnownConsumer implements KnownRepositoryContentConsumer { /** - * @plexus.configuration default-value="unset-id" + * plexus.configuration default-value="unset-id" */ private String id = "unset-id"; @@ -102,4 +102,9 @@ public class SampleKnownConsumer { return false; } + + public void setId( String id ) + { + this.id = id; + } } diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml deleted file mode 100644 index acf979534..000000000 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/org/apache/archiva/repository/scanner/RepositoryContentConsumersTest.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - org.apache.maven.archiva.configuration.ArchivaConfiguration - org.apache.maven.archiva.configuration.DefaultArchivaConfiguration - - - org.codehaus.plexus.registry.Registry - configured - - - org.apache.maven.archiva.policies.PreDownloadPolicy - prePolicies - - - org.apache.maven.archiva.policies.PostDownloadPolicy - postPolicies - - - - - org.codehaus.plexus.registry.Registry - configured - org.codehaus.redback.components.registry.commons.CommonsConfigurationRegistry - - - - - - - ]]> - - - - - - - org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer - update-db-artifact - org.apache.archiva.repository.scanner.SampleKnownConsumer - - update-db-artifact - - - - org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer - create-missing-checksums - org.apache.archiva.repository.scanner.SampleKnownConsumer - - create-missing-checksums - - - - org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer - update-db-repository-metadata - org.apache.archiva.repository.scanner.SampleKnownConsumer - - update-db-repository-metadata - - - - org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer - validate-checksum - org.apache.archiva.repository.scanner.SampleKnownConsumer - - validate-checksum - - - - org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer - index-content - org.apache.archiva.repository.scanner.SampleKnownConsumer - - index-content - - - - org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer - auto-remove - org.apache.archiva.repository.scanner.SampleKnownConsumer - - auto-remove - - - - org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer - auto-rename - org.apache.archiva.repository.scanner.SampleKnownConsumer - - auto-rename - - - - org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer - available-but-unselected - org.apache.archiva.repository.scanner.SampleKnownConsumer - - available-but-unselected - - - - - - org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer - update-db-bad-content - org.apache.archiva.repository.scanner.InvalidScanConsumer - - update-db-bad-content - - - - org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer - move-to-trash-then-notify - org.apache.archiva.repository.scanner.InvalidScanConsumer - - move-to-trash-then-notify - - - - org.apache.archiva.repository.scanner.RepositoryContentConsumers - test - org.apache.archiva.repository.scanner.RepositoryContentConsumersStub - - - - diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml new file mode 100644 index 000000000..69c2d2875 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +