Author: joakime
Date: Thu Mar 13 22:39:17 2008
New Revision: 636997
URL: http://svn.apache.org/viewvc?rev=636997&view=rev
Log:
MRM-710: Use commons-lang instead of Plexus Utils
Replacing plexus utils StringUtils with FilenameUtils.
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java?rev=636997&r1=636996&r2=636997&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/scanner/functors/ConsumerWantsFilePredicate.java
Thu Mar 13 22:39:17 2008
@@ -20,10 +20,10 @@
*/
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 @@
if ( object instanceof RepositoryContentConsumer )
{
RepositoryContentConsumer consumer = (RepositoryContentConsumer)
object;
- if ( wantsFile( consumer, StringUtils.replace(
basefile.getRelativePath(), "\\", "/" ) ) )
+ if ( wantsFile( consumer, FilenameUtils.separatorsToUnix(
basefile.getRelativePath() ) ) )
{
satisfies = true;