You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/01/13 02:46:33 UTC
svn commit: r733987 - in /maven/mercury/trunk:
mercury-it/src/test/java/org/apache/maven/mercury/plexus/
mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/
mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/
mercury-repo/merc...
Author: ogusakov
Date: Mon Jan 12 17:46:33 2009
New Revision: 733987
URL: http://svn.apache.org/viewvc?rev=733987&view=rev
Log:
refactored a util method to make it more logical: copy from to
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=733987&r1=733986&r2=733987&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Mon Jan 12 17:46:33 2009
@@ -101,7 +101,7 @@
// prep. Artifact
File artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
- FileUtil.writeRawData( artifactBinary, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
+ FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), artifactBinary );
a = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven.mercury:mercury-core:2.0.9") );
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java?rev=733987&r1=733986&r2=733987&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/AbstractRepositoryWriterM2Test.java Mon Jan 12 17:46:33 2009
@@ -125,13 +125,13 @@
vFacSha1.add( sha1F );
artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
- FileUtil.writeRawData( artifactBinary, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
+ FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), artifactBinary );
binarySize = artifactBinary.length();
_log.info( "Binary size is "+binarySize+" bytes" );
artifactPom = File.createTempFile( "test-repo-writer", "pom" );
- FileUtil.writeRawData( artifactPom, getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ) );
+ FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.pom" ), artifactPom );
pomSize = artifactPom.length();
pomBytes = FileUtil.readRawData( artifactPom );
}
@@ -265,7 +265,7 @@
DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0.9-20080805.215925-"+si) );
da.setPomBlob( pomBytes );
File ab = File.createTempFile( "test-core-", "-bin" );
- FileUtil.writeRawData( ab, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
+ FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), ab );
da.setFile( ab );
set.add( da );
}
@@ -334,14 +334,14 @@
DefaultArtifact da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-core:2.0."+si+"-SNAPSHOT") );
da.setPomBlob( pomBytes );
File ab = File.createTempFile( "test-core-", "-bin" );
- FileUtil.writeRawData( ab, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
+ FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), ab );
da.setFile( ab );
set.add( da );
da = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven:maven-mercury:2.0."+si+"-SNAPSHOT") );
da.setPomBlob( pomBytes );
ab = File.createTempFile( "test-mercury-", "-bin" );
- FileUtil.writeRawData( ab, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
+ FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), ab );
da.setFile( ab );
set.add( da );
}
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java?rev=733987&r1=733986&r2=733987&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/VirtualRepositoryReaderIntegratedTest.java Mon Jan 12 17:46:33 2009
@@ -179,7 +179,7 @@
// restore back 5 versions
File mdf = new File( _testBase, "a/a/maven-metadata.xml");
InputStream in = VirtualRepositoryReaderIntegratedTest.class.getResourceAsStream( "/repoVr/a.a-maven-metadata.xml" );
- FileUtil.writeRawData( mdf, in );
+ FileUtil.writeRawData( in, mdf );
}
}
//-------------------------------------------------------------------------
Modified: maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=733987&r1=733986&r2=733987&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-plexus/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Mon Jan 12 17:46:33 2009
@@ -99,7 +99,7 @@
// prep. Artifact
File artifactBinary = File.createTempFile( "test-repo-writer", "bin" );
- FileUtil.writeRawData( artifactBinary, getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ) );
+ FileUtil.writeRawData( getClass().getResourceAsStream( "/maven-core-2.0.9.jar" ), artifactBinary );
a = new DefaultArtifact( new ArtifactBasicMetadata("org.apache.maven.mercury:mercury-core:2.0.9") );
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java?rev=733987&r1=733986&r2=733987&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/src/test/java/org/apache/maven/mercury/repository/local/flat/LocalRepositoryFlatTest.java Mon Jan 12 17:46:33 2009
@@ -71,7 +71,7 @@
File ant = File.createTempFile( "test-flat", "-repo" );
ant.deleteOnExit();
InputStream in = LocalRepositoryFlatTest.class.getResourceAsStream( "/ant-1.6.5.jar" );
- FileUtil.writeRawData( ant, in );
+ FileUtil.writeRawData( in, ant );
a.setFile( ant );
a.setPomBlob( pomBlob );
@@ -80,7 +80,7 @@
File antlr = File.createTempFile( "test-flat", "-repo" );
antlr.deleteOnExit();
in = LocalRepositoryFlatTest.class.getResourceAsStream( "/antlr-2.7.7.jar" );
- FileUtil.writeRawData( antlr, in );
+ FileUtil.writeRawData( in, antlr );
b.setFile( antlr );
b.setPomBlob( pomBlob );
}
Modified: maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java?rev=733987&r1=733986&r2=733987&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java (original)
+++ maven/mercury/trunk/mercury-util/src/main/java/org/apache/maven/mercury/util/FileUtil.java Mon Jan 12 17:46:33 2009
@@ -144,12 +144,15 @@
throws IOException
{
File fOut = null;
+
if( toFile.isDirectory() )
fOut = new File(toFile, f.getName() );
else
fOut = toFile;
+
FileInputStream fis = new FileInputStream(f);
- writeRawData( fOut, fis );
+
+ writeRawData( fis, fOut );
}
//---------------------------------------------------------------------------------------------------------------
/**
@@ -312,7 +315,7 @@
writeRawData( file, sBytes.getBytes( DEFAULT_CHARSET ) );
}
//---------------------------------------------------------------------------------------------------------------
- public static void writeRawData( File f, InputStream in )
+ public static void writeRawData( InputStream in, File f )
throws IOException
{
OutputStream out = new FileOutputStream( f );
@@ -323,6 +326,7 @@
while( (n = in.read( buf ) ) > 0 )
out.write( buf, 0, n );
+
out.flush();
}
finally