mirror of https://github.com/apache/archiva.git
Little fix for windows.
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@511840 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
43bb7a6d9a
commit
731f368e62
|
@ -26,6 +26,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||||
import org.codehaus.plexus.logging.Logger;
|
import org.codehaus.plexus.logging.Logger;
|
||||||
import org.codehaus.plexus.util.DirectoryWalkListener;
|
import org.codehaus.plexus.util.DirectoryWalkListener;
|
||||||
import org.codehaus.plexus.util.SelectorUtils;
|
import org.codehaus.plexus.util.SelectorUtils;
|
||||||
|
import org.codehaus.plexus.util.StringUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
@ -67,8 +68,8 @@ public class RepositoryScanner
|
||||||
|
|
||||||
if ( !consumer.init( this.repository ) )
|
if ( !consumer.init( this.repository ) )
|
||||||
{
|
{
|
||||||
throw new IllegalStateException( "Consumer [" + consumer.getName()
|
throw new IllegalStateException( "Consumer [" + consumer.getName() +
|
||||||
+ "] is reporting that it is incompatible with the [" + repository.getId() + "] repository." );
|
"] is reporting that it is incompatible with the [" + repository.getId() + "] repository." );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,7 +115,7 @@ public class RepositoryScanner
|
||||||
{
|
{
|
||||||
Consumer consumer = (Consumer) itConsumers.next();
|
Consumer consumer = (Consumer) itConsumers.next();
|
||||||
|
|
||||||
if ( wantsFile( consumer, basefile.getRelativePath() ) )
|
if ( wantsFile( consumer, StringUtils.replace( basefile.getRelativePath(), "\\", "/" ) ) )
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -127,16 +128,14 @@ public class RepositoryScanner
|
||||||
/* Intentionally Catch all exceptions.
|
/* Intentionally Catch all exceptions.
|
||||||
* So that the discoverer processing can continue.
|
* So that the discoverer processing can continue.
|
||||||
*/
|
*/
|
||||||
getLogger().error(
|
getLogger().error( "Consumer [" + consumer.getName() + "] had an error when processing file [" +
|
||||||
"Consumer [" + consumer.getName() + "] had an error when processing file ["
|
basefile.getAbsolutePath() + "]: " + e.getMessage(), e );
|
||||||
+ basefile.getAbsolutePath() + "]: " + e.getMessage(), e );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
getLogger().debug(
|
getLogger().debug(
|
||||||
"Skipping consumer " + consumer.getName() + " for file "
|
"Skipping consumer " + consumer.getName() + " for file " + basefile.getRelativePath() );
|
||||||
+ basefile.getRelativePath() );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -179,7 +178,7 @@ public class RepositoryScanner
|
||||||
// Not included, and Not excluded? Default to EXCLUDE.
|
// Not included, and Not excluded? Default to EXCLUDE.
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getOnlyModifiedAfterTimestamp()
|
public long getOnlyModifiedAfterTimestamp()
|
||||||
{
|
{
|
||||||
return onlyModifiedAfterTimestamp;
|
return onlyModifiedAfterTimestamp;
|
||||||
|
|
Loading…
Reference in New Issue