Author: joakime
Date: Thu Mar 13 22:01:56 2008
New Revision: 636993
URL: http://svn.apache.org/viewvc?rev=636993&view=rev
Log:
[MRM-709] Use commons-io instead of Plexus Utils
* Some more IOUtil and FileUtil conversions.
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesRecordLoader.java
maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java?rev=636993&r1=636992&r2=636993&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/bytecode/BytecodeRecordLoader.java
Thu Mar 13 22:01:56 2008
@@ -9,7 +9,7 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
@@ -20,10 +20,11 @@
*/
import junit.framework.AssertionFailedError;
+
+import org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaArtifactJavaDetails;
import org.apache.maven.archiva.model.platform.JavaArtifactHelper;
-import org.codehaus.plexus.util.IOUtil;
import java.io.BufferedReader;
import java.io.File;
@@ -125,8 +126,8 @@
}
finally
{
- IOUtil.close( reader );
- IOUtil.close( freader );
+ IOUtils.closeQuietly( reader );
+ IOUtils.closeQuietly( freader );
}
// cache.put( artifact, record );
Modified:
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesRecordLoader.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesRecordLoader.java?rev=636993&r1=636992&r2=636993&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesRecordLoader.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/hashcodes/HashcodesRecordLoader.java
Thu Mar 13 22:01:56 2008
@@ -19,10 +19,10 @@
* under the License.
*/
+import org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArchivaArtifactJavaDetails;
import org.apache.maven.archiva.model.platform.JavaArtifactHelper;
-import org.codehaus.plexus.util.IOUtil;
import java.io.BufferedReader;
import java.io.File;
@@ -97,8 +97,8 @@
}
finally
{
- IOUtil.close( reader );
- IOUtil.close( freader );
+ IOUtils.closeQuietly( reader );
+ IOUtils.closeQuietly( freader );
}
return record;
Modified: maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml?rev=636993&r1=636992&r2=636993&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml Thu Mar 13
22:01:56 2008
@@ -29,6 +29,10 @@
<description>API for managing transaction.</description>
<dependencies>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-digest</artifactId>
<version>1.0</version>
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java?rev=636993&r1=636992&r2=636993&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
Thu Mar 13 22:01:56 2008
@@ -19,10 +19,10 @@
* under the License.
*/
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.digest.Digester;
import org.codehaus.plexus.digest.DigesterException;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
import java.io.File;
import java.io.FileOutputStream;
@@ -215,19 +215,13 @@
}
}
+ /**
+ * TODO: Remove in favor of using FileUtils directly.
+ */
protected void writeStringToFile( File file, String content )
throws IOException
{
- FileOutputStream out = null;
- try
- {
- out = new FileOutputStream( file );
- IOUtil.copy( content, out );
- }
- finally
- {
- IOUtil.close( out );
- }
+ FileUtils.writeStringToFile( file, content );
}
/**
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java?rev=636993&r1=636992&r2=636993&view=diff
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
Thu Mar 13 22:01:56 2008
@@ -19,9 +19,9 @@
* under the License.
*/
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.digest.Digester;
-import org.codehaus.plexus.util.IOUtil;
import java.io.File;
import java.io.FileInputStream;
@@ -85,7 +85,7 @@
try
{
in = new FileInputStream( file );
- return IOUtil.toString( in );
+ return IOUtils.toString( in );
}
finally
{
