svn commit: r834426 - in /archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src: main/java/org/apache/archiva/consumers/lucene/ test/java/org/apache/archiva/consumers/lucene/

[oching]

Author: oching
Date: Tue Nov 10 11:04:15 2009
New Revision: 834426

URL: http://svn.apache.org/viewvc?rev=834426&view=rev
Log:
[MRM-1275] Include other file types for the index consumer instead of just the 
indexable-content
o add artifacts file types so it gets processed by the consumer
o added unit test

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=834426&r1=834425&r2=834426&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
 Tue Nov 10 11:04:15 2009
@@ -173,6 +173,8 @@
         includes.clear();
 
         includes.addAll( filetypes.getFileTypePatterns( 
FileTypes.INDEXABLE_CONTENT ) );
+        
+        includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) 
);
     }
 
     public void initialize()

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java?rev=834426&r1=834425&r2=834426&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumerTest.java
 Tue Nov 10 11:04:15 2009
@@ -24,6 +24,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
@@ -36,6 +37,7 @@
 import org.apache.maven.archiva.scheduled.tasks.ArtifactIndexingTask;
 import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
 import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.spring.PlexusInSpringTestCase;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
@@ -125,6 +127,9 @@
         FileTypes filetypes = (FileTypes) lookup( FileTypes.class );
 
         nexusIndexerConsumer = new NexusIndexerConsumer( scheduler, 
configuration, filetypes );
+        
+        // initialize to set the file types to be processed
+        ( (Initializable) nexusIndexerConsumer ).initialize();
 
         repositoryConfig = new ManagedRepositoryConfiguration();
         repositoryConfig.setId( "test-repo" );
@@ -218,6 +223,19 @@
 
         assertTrue( scheduler.indexed.contains( artifactFile ) );
     }
+    
+    // MRM-1275 - Include other file types for the index consumer instead of 
just the indexable-content
+    public void testIncludedFileTypes()
+        throws Exception
+    {
+        List<String> includes =  nexusIndexerConsumer.getIncludes();
+        assertTrue( ".pom artifacts should be processed.", includes.contains( 
"**/*.pom" ) );
+        assertTrue( ".xml artifacts should be processed.", includes.contains( 
"**/*.xml" ) );
+        assertTrue( ".txt artifacts should be processed.", includes.contains( 
"**/*.txt" ) );
+        assertTrue( ".jar artifacts should be processed.", includes.contains( 
"**/*.jar" ) );
+        assertTrue( ".war artifacts should be processed.", includes.contains( 
"**/*.war" ) );
+        assertTrue( ".zip artifacts should be processed.", includes.contains( 
"**/*.zip" ) );
+    }
 
     @Override
     protected String getPlexusConfigLocation()