mirror of https://github.com/apache/archiva.git
use plexus copyDirectoryStructure (the other method was not overwriting files which is not acceptable in test cases as old state can be left behind)
git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@417696 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
7a5b4547af
commit
794b829284
|
@ -83,7 +83,7 @@ public class RepositoryConverterTest
|
||||||
layout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
|
layout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
|
||||||
|
|
||||||
File targetBase = getTestFile( "target/test-target-repository" );
|
File targetBase = getTestFile( "target/test-target-repository" );
|
||||||
copyDirectoryStructure( getTestFile( "src/test/target-repository" ), targetBase );
|
FileUtils.copyDirectoryStructure( getTestFile( "src/test/target-repository" ), targetBase );
|
||||||
|
|
||||||
targetRepository =
|
targetRepository =
|
||||||
factory.createArtifactRepository( "target", targetBase.toURL().toString(), layout, null, null );
|
factory.createArtifactRepository( "target", targetBase.toURL().toString(), layout, null, null );
|
||||||
|
@ -930,52 +930,4 @@ public class RepositoryConverterTest
|
||||||
sourceRepository =
|
sourceRepository =
|
||||||
factory.createArtifactRepository( "source", sourceBase.toURL().toString(), layout, null, null );
|
factory.createArtifactRepository( "source", sourceBase.toURL().toString(), layout, null, null );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void copyDirectoryStructure( File sourceDirectory, File destinationDirectory )
|
|
||||||
throws IOException
|
|
||||||
{
|
|
||||||
if ( !sourceDirectory.exists() )
|
|
||||||
{
|
|
||||||
throw new IOException( "Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ")." );
|
|
||||||
}
|
|
||||||
|
|
||||||
File[] files = sourceDirectory.listFiles();
|
|
||||||
|
|
||||||
String sourcePath = sourceDirectory.getAbsolutePath();
|
|
||||||
|
|
||||||
for ( int i = 0; i < files.length; i++ )
|
|
||||||
{
|
|
||||||
File file = files[i];
|
|
||||||
|
|
||||||
String dest = file.getAbsolutePath();
|
|
||||||
|
|
||||||
dest = dest.substring( sourcePath.length() + 1 );
|
|
||||||
|
|
||||||
File destination = new File( destinationDirectory, dest );
|
|
||||||
|
|
||||||
if ( file.isFile() )
|
|
||||||
{
|
|
||||||
destination = destination.getParentFile();
|
|
||||||
|
|
||||||
FileUtils.copyFileToDirectory( file, destination );
|
|
||||||
}
|
|
||||||
else if ( file.isDirectory() )
|
|
||||||
{
|
|
||||||
if ( !".svn".equals( file.getName() ) )
|
|
||||||
{
|
|
||||||
if ( !destination.exists() && !destination.mkdirs() )
|
|
||||||
{
|
|
||||||
throw new IOException(
|
|
||||||
"Could not create destination directory '" + destination.getAbsolutePath() + "'." );
|
|
||||||
}
|
|
||||||
|
|
||||||
copyDirectoryStructure( file, destination );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw new IOException( "Unknown file type: " + file.getAbsolutePath() );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue