You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by jo...@apache.org on 2007/04/13 20:57:22 UTC
svn commit: r528591 - in
/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src:
main/java/org/apache/maven/archiva/scheduled/executors/
test/resources/org/apache/maven/archiva/scheduled/executors/
Author: joakime
Date: Fri Apr 13 11:57:22 2007
New Revision: 528591
URL: http://svn.apache.org/viewvc?view=rev&rev=528591
Log:
Correcting some plexus mappings (to help in unit tests).
Modified:
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.xml
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java?view=diff&rev=528591&r1=528590&r2=528591
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutor.java Fri Apr 13 11:57:22 2007
@@ -69,10 +69,17 @@
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 @@
{
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 @@
{
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
{
Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.xml
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.xml?view=diff&rev=528591&r1=528590&r2=528591
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.xml (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-scheduled/src/test/resources/org/apache/maven/archiva/scheduled/executors/ArchivaScheduledTaskExecutorTest.xml Fri Apr 13 11:57:22 2007
@@ -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>