Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correcting some plexus mappings (to help in unit tests). 

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@528591 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2007-04-13 18:57:22 +00:00
parent ab8648688b
commit 710b963f2a
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
View File

@ -69,10 +69,17 @@ public class ArchivaScheduledTaskExecutor extends AbstractLogEnabled implements
private RepositoryDAO repositoryDAO;
/**
* The collection of available consumers.
* The collection of available database consumers.
* @plexus.requirement role="org.apache.maven.archiva.consumers.ArchivaArtifactConsumer"
*/
private Map availableConsumers;
private Map availableDBConsumers;
/**
* The collection of available repository consumers.
* @plexus.requirement role="org.apache.maven.archiva.consumers.RepositoryContentConsumer"
*/
private Map availableRepositoryConsumers;
public void executeTask( Task task ) throws TaskExecutionException
{
@ -164,9 +171,9 @@ public class ArchivaScheduledTaskExecutor extends AbstractLogEnabled implements
{
String consumer = (String)i.next();
if ( availableConsumers.containsKey( availableConsumers.get( consumer ) ) )
if ( availableRepositoryConsumers.containsKey( availableRepositoryConsumers.get( consumer ) ) )
{
activeConsumers.add( availableConsumers.get( consumer ) );
activeConsumers.add( availableRepositoryConsumers.get( consumer ) );
}
else
{
@ -178,10 +185,10 @@ public class ArchivaScheduledTaskExecutor extends AbstractLogEnabled implements
{
String consumer = (String)i.next();
if ( availableConsumers.containsKey( availableConsumers.get( consumer ) ) )
if ( availableRepositoryConsumers.containsKey( availableRepositoryConsumers.get( consumer ) ) )
{
getLogger().warn( "Using consumer " + consumer );
activeConsumers.add( availableConsumers.get( consumer ) );
activeConsumers.add( availableRepositoryConsumers.get( consumer ) );
}
else
{

8
archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.xml
View File

@ -41,9 +41,13 @@
<role-hint>jdo</role-hint>
<field-name>repositoryDAO</field-name>
</requirement>
<requirement>
<requirement>
<role>org.apache.maven.archiva.consumers.ArchivaArtifactConsumer</role>
<field-name>availableConsumers</field-name>
<field-name>availableDBConsumers</field-name>
</requirement>
<requirement>
<role>org.apache.maven.archiva.consumers.RepositoryContentConsumer</role>
<field-name>availableRepositoryConsumers</field-name>
</requirement>
</requirements>
</component>