svn commit: r805371 - in /archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src: main/java/org/apache/maven/archiva/configuration/FileTypes.java test/java/org/apache/maven/archiva/configuration/FileTypesTest.java

[jzurbano]

Author: jzurbano
Date: Tue Aug 18 11:41:29 2009
New Revision: 805371

URL: http://svn.apache.org/viewvc?rev=805371&view=rev
Log:
[MRM-1151] - Error when processing file nexus-maven-repository-index.zip
applied patch and added unit test.
Submitted by: Gwen Harold Autencio


Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/FileTypesTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java?rev=805371&r1=805370&r2=805371&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/FileTypes.java
 Tue Aug 18 11:41:29 2009
@@ -78,7 +78,8 @@
      */
     public static final List<String> DEFAULT_EXCLUSIONS = Arrays.asList( 
"**/maven-metadata.xml",
                                                                           
"**/maven-metadata-*.xml", "**/*.sha1",
-                                                                          
"**/*.asc", "**/*.md5", "**/*.pgp" );
+                                                                          
"**/*.asc", "**/*.md5", "**/*.pgp", 
+                                                                          
"**/.index/*.*");
 
     public void setArchivaConfiguration( ArchivaConfiguration 
archivaConfiguration )
     {

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/FileTypesTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/FileTypesTest.java?rev=805371&r1=805370&r2=805371&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/FileTypesTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/maven/archiva/configuration/FileTypesTest.java
 Tue Aug 18 11:41:29 2009
@@ -52,4 +52,18 @@
         assertFalse( filetypes.matchesArtifactPattern( 
"org/apache/derby/derby/10.2.2.0/maven-metadata.xml" ) );
         assertFalse( filetypes.matchesArtifactPattern( 
"org/apache/derby/derby/maven-metadata.xml" ) );
     }
+    
+    public void testDefaultExclusions()
+    {
+        assertTrue( filetypes.matchesDefaultExclusions( 
"repository/test/.index/nexus-maven-repository-index.gz" ) );
+        assertTrue( filetypes.matchesDefaultExclusions( 
"repository/test/.index/nexus-maven-repository-index.zip" ) );
+        assertTrue( filetypes.matchesDefaultExclusions( 
"repository/test/org/apache/derby/derby/10.2.2.0/derby-10.2.2.0-bin.tar.gz.sha1"
 ) );
+        assertTrue( filetypes.matchesDefaultExclusions( 
"repository/test/org/apache/derby/derby/10.2.2.0/derby-10.2.2.0-bin.tar.gz.md5" 
) );
+        assertTrue( filetypes.matchesDefaultExclusions( 
"repository/test/org/apache/derby/derby/10.2.2.0/maven-metadata.xml" ) );
+        assertTrue( filetypes.matchesDefaultExclusions( 
"repository/test/org/apache/derby/derby/10.2.2.0/maven-metadata.xml.sha1" ) );
+        assertTrue( filetypes.matchesDefaultExclusions( 
"repository/test/org/apache/derby/derby/10.2.2.0/maven-metadata.xml.md5" ) );
+        
+        assertFalse( filetypes.matchesDefaultExclusions( 
"repository/test/org/apache/derby/derby/10.2.2.0/derby-10.2.2.0-bin.zip" ) );
+        assertFalse( filetypes.matchesDefaultExclusions( 
"repository/test/org/apache/derby/derby/10.2.2.0/derby-10.2.2.0-bin.tar.gz" ) );
+    }
 }