svn commit: r475959 - in /maven/archiva/trunk/archiva-discoverer/src: main/java/org/apache/maven/archiva/discoverer/ test/java/org/apache/maven/archiva/discoverer/ test/repository/org/apache/maven/testing/1.0/

[bayard]

Author: bayard
Date: Thu Nov 16 14:54:32 2006
New Revision: 475959

URL: http://svn.apache.org/viewvc?view=rev&rev=475959
Log:
Applying Tom Huybrechts patch rom MRM-226. Stops the indexer blo
wing up when it hits it and thinks its a -sources for a foo-test artifact

Added:
    
maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
Modified:
    
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java
    
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java

Modified: 
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java?view=diff&rev=475959&r1=475958&r2=475959
==============================================================================
--- 
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java
 (original)
+++ 
maven/archiva/trunk/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java
 Thu Nov 16 14:54:32 2006
@@ -87,6 +87,13 @@
                     type = "distribution-zip";
                     remainingFilename = remainingFilename.substring( 0, 
remainingFilename.length() - ".zip".length() );
                 }
+                else if ( remainingFilename.endsWith( "-test-sources.jar" ) )
+                {
+                    type = "java-source";
+                    classifier = "test-sources";
+                    remainingFilename =
+                        remainingFilename.substring( 0, 
remainingFilename.length() - "-test-sources.jar".length() );
+                }
                 else if ( remainingFilename.endsWith( "-sources.jar" ) )
                 {
                     type = "java-source";

Modified: 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java?view=diff&rev=475959&r1=475958&r2=475959
==============================================================================
--- 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java
 (original)
+++ 
maven/archiva/trunk/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java
 Thu Nov 16 14:54:32 2006
@@ -364,6 +364,16 @@
             createArtifact( "org.apache.maven", "testing", "1.0", 
"java-source", "sources" ) ) );
     }
 
+    public void testTestSourcesInclusion()
+    throws DiscovererException
+{
+    List artifacts = discoverArtifactsWithSnapshots();
+    assertNotNull( "Check artifacts not null", artifacts );
+
+    assertTrue( "Check normal included", artifacts.contains(
+        createArtifact( "org.apache.maven", "testing", "1.0", "java-source", 
"test-sources" ) ) );
+}
+
     public void testDistributionInclusion()
         throws DiscovererException
     {

Added: 
maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar
URL: 
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-discoverer/src/test/repository/org/apache/maven/testing/1.0/testing-1.0-test-sources.jar?view=auto&rev=475959
==============================================================================
    (empty)