From: Joakim Erdfelt <joakime@apache.org>
Date: Fri, 14 Mar 2008 05:39:17 +0000 (+0000)
Subject: MRM-710: Use commons-lang instead of Plexus Utils
X-Git-Tag: archiva-r676265~311
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=97bffde52d2745b3018801ce75e317177fa8fe96;p=archiva.git

MRM-710: Use commons-lang instead of Plexus Utils
Replacing plexus utils StringUtils with FilenameUtils.


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@636997 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
index 29e3ef419..97e97b407 100644
--- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
+++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
@@ -20,10 +20,10 @@ package org.apache.maven.archiva.repository.scanner.functors;
  */
 
 import org.apache.commons.collections.Predicate;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.maven.archiva.common.utils.BaseFile;
 import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
 import org.codehaus.plexus.util.SelectorUtils;
-import org.codehaus.plexus.util.StringUtils;
 
 import java.util.List;
 
@@ -51,7 +51,7 @@ public class ConsumerWantsFilePredicate
         if ( object instanceof RepositoryContentConsumer )
         {
             RepositoryContentConsumer consumer = (RepositoryContentConsumer) object;
-            if ( wantsFile( consumer, StringUtils.replace( basefile.getRelativePath(), "\\", "/" ) ) )
+            if ( wantsFile( consumer, FilenameUtils.separatorsToUnix( basefile.getRelativePath() ) ) )
             {
                 satisfies = true;