You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ba...@apache.org on 2006/12/02 08:57:04 UTC
svn commit: r481517 - in /maven/archiva/trunk/archiva-converter/src:
main/java/org/apache/maven/archiva/converter/
main/java/org/apache/maven/archiva/converter/transaction/
test/java/org/apache/maven/archiva/converter/
test/java/org/apache/maven/archiv...
Author: bayard
Date: Fri Dec 1 23:57:01 2006
New Revision: 481517
URL: http://svn.apache.org/viewvc?view=rev&rev=481517
Log:
Moved to Commons IO FileUtils. Generally improves things, though you have to pass a null parameter to readStringFromFile and writeStringToFile to imply the default encoding should be used.
Modified:
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java
maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java
maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java
Modified: maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java?view=diff&rev=481517&r1=481516&r2=481517
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java (original)
+++ maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java Fri Dec 1 23:57:01 2006
@@ -41,7 +41,7 @@
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -432,7 +432,7 @@
}
// Even if the checksums for the POM are invalid we should still convert the POM
- contents = FileUtils.fileRead( file );
+ contents = FileUtils.readFileToString( file, null );
}
catch ( IOException e )
{
@@ -447,7 +447,7 @@
boolean matching = false;
if ( !force && targetFile.exists() )
{
- String targetContents = FileUtils.fileRead( targetFile );
+ String targetContents = FileUtils.readFileToString( targetFile, null );
matching = targetContents.equals( contents );
}
if ( force || !matching )
@@ -650,7 +650,7 @@
File checksumFile = new File( file.getParentFile(), fileName );
if ( checksumFile.exists() )
{
- String checksum = FileUtils.fileRead( checksumFile );
+ String checksum = FileUtils.readFileToString( checksumFile, null );
try
{
digester.verify( file, checksum );
Modified: maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java?view=diff&rev=481517&r1=481516&r2=481517
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java (original)
+++ maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/AbstractTransactionEvent.java Fri Dec 1 23:57:01 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -85,7 +85,7 @@
if ( dir.isDirectory() && dir.list().length == 0 )
{
- FileUtils.deleteDirectory( dir.getAbsolutePath() );
+ FileUtils.deleteDirectory( dir );
}
else
{
Modified: maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java?view=diff&rev=481517&r1=481516&r2=481517
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java (original)
+++ maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CopyFileEvent.java Fri Dec 1 23:57:01 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -52,7 +52,7 @@
public void rollback()
throws IOException
{
- FileUtils.fileDelete( destination.getAbsolutePath() );
+ destination.delete();
revertMkDirs();
Modified: maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java?view=diff&rev=481517&r1=481516&r2=481517
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java (original)
+++ maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/transaction/CreateFileEvent.java Fri Dec 1 23:57:01 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -51,13 +51,13 @@
throw new IOException( "Unable to create new file" );
}
- FileUtils.fileWrite( destination.getAbsolutePath(), content );
+ FileUtils.writeStringToFile( destination, content, null );
}
public void rollback()
throws IOException
{
- FileUtils.fileDelete( destination.getAbsolutePath() );
+ destination.delete();
revertMkDirs();
Modified: maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java?view=diff&rev=481517&r1=481516&r2=481517
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java (original)
+++ maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/RepositoryConverterTest.java Fri Dec 1 23:57:01 2006
@@ -30,7 +30,7 @@
import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
import java.io.IOException;
@@ -920,8 +920,8 @@
private static void compareFiles( File expectedPomFile, File pomFile )
throws IOException
{
- String expectedContent = normalizeString( FileUtils.fileRead( expectedPomFile ) );
- String targetContent = normalizeString( FileUtils.fileRead( pomFile ) );
+ String expectedContent = normalizeString( FileUtils.readFileToString( expectedPomFile, null ) );
+ String targetContent = normalizeString( FileUtils.readFileToString( pomFile, null ) );
assertEquals( "Check file match between " + expectedPomFile + " and " + pomFile, expectedContent,
targetContent );
}
Modified: maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java?view=diff&rev=481517&r1=481516&r2=481517
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java (original)
+++ maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CopyFileEventTest.java Fri Dec 1 23:57:01 2006
@@ -17,7 +17,7 @@
*/
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -42,7 +42,7 @@
testSource.createNewFile();
- FileUtils.fileWrite( testSource.getAbsolutePath(), "source contents" );
+ FileUtils.writeStringToFile( testSource, "source contents", null );
}
public void testCopyCommitRollback()
@@ -50,7 +50,7 @@
{
assertTrue( "Test if the source exists", testSource.exists() );
- String source = FileUtils.fileRead( testSource.getAbsolutePath() );
+ String source = FileUtils.readFileToString( testSource, null );
CopyFileEvent event = new CopyFileEvent( testSource, testDest );
@@ -60,7 +60,7 @@
assertTrue( "Test that the destination is created", testDest.exists() );
- String target = FileUtils.fileRead( testDest.getAbsolutePath() );
+ String target = FileUtils.readFileToString( testDest, null );
assertTrue( "Test that the destination contents are copied correctly", source.equals( target ) );
@@ -74,31 +74,31 @@
{
assertTrue( "Test if the source exists", testSource.exists() );
- String source = FileUtils.fileRead( testSource.getAbsolutePath() );
+ String source = FileUtils.readFileToString( testSource, null );
testDest.getParentFile().mkdirs();
testDest.createNewFile();
- FileUtils.fileWrite( testDest.getAbsolutePath(), "overwritten contents" );
+ FileUtils.writeStringToFile( testDest, "overwritten contents", null );
assertTrue( "Test that the destination exists", testDest.exists() );
CopyFileEvent event = new CopyFileEvent( testSource, testDest );
- String target = FileUtils.fileRead( testDest.getAbsolutePath() );
+ String target = FileUtils.readFileToString( testDest, null );
assertTrue( "Test that the destination contents have not changed", target.equals( "overwritten contents" ) );
event.commit();
- target = FileUtils.fileRead( testDest.getAbsolutePath() );
+ target = FileUtils.readFileToString( testDest, null );
assertTrue( "Test that the destination contents are copied correctly", source.equals( target ) );
event.rollback();
- target = FileUtils.fileRead( testDest.getAbsolutePath() );
+ target = FileUtils.readFileToString( testDest, null );
assertTrue( "Test the destination file contents have been restored", target.equals( "overwritten contents" ) );
}
@@ -108,7 +108,7 @@
{
assertTrue( "Test if the source exists", testSource.exists() );
- String source = FileUtils.fileRead( testSource.getAbsolutePath() );
+ String source = FileUtils.readFileToString( testSource, null );
CopyFileEvent event = new CopyFileEvent( testSource, testDest );
@@ -122,7 +122,7 @@
assertTrue( "Test that the destination is created", testDest.exists() );
- String target = FileUtils.fileRead( testDest.getAbsolutePath() );
+ String target = FileUtils.readFileToString( testDest, null );
assertTrue( "Test that the destination contents are copied correctly", source.equals( target ) );
}
@@ -132,7 +132,6 @@
{
super.tearDown();
- FileUtils.deleteDirectory(
- new File( PlexusTestCase.getBasedir(), "target/transaction-tests" ).getAbsolutePath() );
+ FileUtils.deleteDirectory( new File( PlexusTestCase.getBasedir(), "target/transaction-tests" ) );
}
}
Modified: maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java?view=diff&rev=481517&r1=481516&r2=481517
==============================================================================
--- maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java (original)
+++ maven/archiva/trunk/archiva-converter/src/test/java/org/apache/maven/archiva/converter/transaction/CreateFileEventTest.java Fri Dec 1 23:57:01 2006
@@ -17,7 +17,7 @@
*/
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.commons.io.FileUtils;
import java.io.File;
@@ -58,23 +58,23 @@
testFile.createNewFile();
- FileUtils.fileWrite( testFile.getAbsolutePath(), "original contents" );
+ FileUtils.writeStringToFile( testFile, "original contents", null );
CreateFileEvent event = new CreateFileEvent( "modified contents", testFile );
- String contents = FileUtils.fileRead( testFile.getAbsolutePath() );
+ String contents = FileUtils.readFileToString( testFile, null );
assertEquals( "Test contents have not changed", "original contents", contents );
event.commit();
- contents = FileUtils.fileRead( testFile.getAbsolutePath() );
+ contents = FileUtils.readFileToString( testFile, null );
assertEquals( "Test contents have not changed", "modified contents", contents );
event.rollback();
- contents = FileUtils.fileRead( testFile.getAbsolutePath() );
+ contents = FileUtils.readFileToString( testFile, null );
assertEquals( "Test contents have not changed", "original contents", contents );
}
@@ -102,7 +102,6 @@
{
super.tearDown();
- FileUtils.deleteDirectory(
- new File( PlexusTestCase.getBasedir(), "target/transaction-tests" ).getAbsolutePath() );
+ FileUtils.deleteDirectory( new File( PlexusTestCase.getBasedir(), "target/transaction-tests" ) );
}
}