Author: bayard
Date: Fri Dec 1 16:37:00 2006
New Revision: 481460
URL: http://svn.apache.org/viewvc?view=rev&rev=481460
Log:
Moving from Plexus Utils IOUtil to Commons IO IOUtils. close(..) becomes
closeQuietly(..). copy(..) stays the same. In 1.3 (we're on 1.2 currently)
copy(..) will throw an exception if more than MAXINT bytes are copied, but this
is just a test case so I think we're safe.
Modified:
maven/archiva/trunk/archiva-configuration/pom.xml
maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
maven/archiva/trunk/archiva-converter/pom.xml
maven/archiva/trunk/archiva-converter/src/main/java/org/apache/maven/archiva/converter/DefaultRepositoryConverter.java
maven/archiva/trunk/archiva-proxy/pom.xml
maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
maven/archiva/trunk/archiva-reports-standard/pom.xml
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/DefaultReportingStore.java
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java
maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/pom.xml
maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java
maven/archiva/trunk/pom.xml
Modified: maven/archiva/trunk/archiva-configuration/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/pom.xml?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
--- maven/archiva/trunk/archiva-configuration/pom.xml (original)
+++ maven/archiva/trunk/archiva-configuration/pom.xml Fri Dec 1 16:37:00 2006
@@ -44,6 +44,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified:
maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
---
maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
(original)
+++
maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
Fri Dec 1 16:37:00 2006
@@ -19,7 +19,7 @@
import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Reader;
import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Writer;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -112,7 +112,7 @@
}
finally
{
- IOUtil.close( fileReader );
+ IOUtils.closeQuietly( fileReader );
}
}
return configuration;
@@ -166,7 +166,7 @@
}
finally
{
- IOUtil.close( fileWriter );
+ IOUtils.closeQuietly( fileWriter );
}
}
Modified: maven/archiva/trunk/archiva-converter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-converter/pom.xml?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
--- maven/archiva/trunk/archiva-converter/pom.xml (original)
+++ maven/archiva/trunk/archiva-converter/pom.xml Fri Dec 1 16:37:00 2006
@@ -47,5 +47,9 @@
<artifactId>plexus-i18n</artifactId>
<version>1.0-beta-6</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
</project>
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=481460&r1=481459&r2=481460
==============================================================================
---
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 16:37:00 2006
@@ -42,7 +42,7 @@
import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
@@ -213,7 +213,7 @@
}
finally
{
- IOUtil.close( writer );
+ IOUtils.closeQuietly( writer );
}
}
}
@@ -243,7 +243,7 @@
}
finally
{
- IOUtil.close( fileReader );
+ IOUtils.closeQuietly( fileReader );
}
return metadata;
}
@@ -515,7 +515,7 @@
}
finally
{
- IOUtil.close( writer );
+ IOUtils.closeQuietly( writer );
}
}
}
Modified: maven/archiva/trunk/archiva-proxy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-proxy/pom.xml?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
--- maven/archiva/trunk/archiva-proxy/pom.xml (original)
+++ maven/archiva/trunk/archiva-proxy/pom.xml Fri Dec 1 16:37:00 2006
@@ -53,5 +53,9 @@
<version>1.2_Java1.3</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
---
maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
(original)
+++
maven/archiva/trunk/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java
Fri Dec 1 16:37:00 2006
@@ -42,7 +42,7 @@
import org.codehaus.plexus.digest.DigesterException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
@@ -407,7 +407,7 @@
}
finally
{
- IOUtil.close( fileReader );
+ IOUtils.closeQuietly( fileReader );
}
}
@@ -440,7 +440,7 @@
}
finally
{
- IOUtil.close( fileReader );
+ IOUtils.closeQuietly( fileReader );
}
if ( changed )
@@ -457,7 +457,7 @@
}
finally
{
- IOUtil.close( fileWriter );
+ IOUtils.closeQuietly( fileWriter );
}
}
}
Modified: maven/archiva/trunk/archiva-reports-standard/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/pom.xml?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
--- maven/archiva/trunk/archiva-reports-standard/pom.xml (original)
+++ maven/archiva/trunk/archiva-reports-standard/pom.xml Fri Dec 1 16:37:00
2006
@@ -70,6 +70,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessor.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessor.java?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
---
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessor.java
(original)
+++
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/InvalidPomArtifactReportProcessor.java
Fri Dec 1 16:37:00 2006
@@ -22,7 +22,7 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
@@ -87,7 +87,7 @@
}
finally
{
- IOUtil.close( reader );
+ IOUtils.closeQuietly( reader );
}
}
}
Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
---
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java
(original)
+++
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/processor/LocationArtifactReportProcessor.java
Fri Dec 1 16:37:00 2006
@@ -25,7 +25,7 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.archiva.reporting.processor.ArtifactReportProcessor;
import org.apache.maven.archiva.reporting.database.ReportingDatabase;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
@@ -238,7 +238,7 @@
}
finally
{
- IOUtil.close( isReader );
+ IOUtils.closeQuietly( isReader );
}
return model;
}
Modified:
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/DefaultReportingStore.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/DefaultReportingStore.java?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
---
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/DefaultReportingStore.java
(original)
+++
maven/archiva/trunk/archiva-reports-standard/src/main/java/org/apache/maven/archiva/reporting/store/DefaultReportingStore.java
Fri Dec 1 16:37:00 2006
@@ -25,7 +25,7 @@
import org.apache.maven.archiva.reporting.database.ReportingDatabase;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.commons.io.IOUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
@@ -94,7 +94,7 @@
}
finally
{
- IOUtil.close( fileReader );
+ IOUtils.closeQuietly( fileReader );
}
}
@@ -136,7 +136,7 @@
}
finally
{
- IOUtil.close( fileWriter );
+ IOUtils.closeQuietly( fileWriter );
}
}
}
Modified:
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
---
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java
(original)
+++
maven/archiva/trunk/archiva-reports-standard/src/test/java/org/apache/maven/archiva/reporting/reporter/AbstractChecksumArtifactReporterTestCase.java
Fri Dec 1 16:37:00 2006
@@ -19,7 +19,7 @@
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 org.apache.commons.io.IOUtils;
import org.apache.maven.archiva.reporting.AbstractRepositoryReportsTestCase;
import java.io.BufferedOutputStream;
@@ -136,7 +136,7 @@
BufferedReader in = new BufferedReader( new FileReader( filename1
) );
out.putNextEntry( new JarEntry( filename1 ) );
- IOUtil.copy( in, out );
+ IOUtils.copy( in, out );
in.close();
out.close();
Modified:
maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/pom.xml?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
--- maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/pom.xml
(original)
+++ maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/pom.xml
Fri Dec 1 16:37:00 2006
@@ -59,5 +59,9 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
---
maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java
(original)
+++
maven/archiva/trunk/archiva-sandbox/archiva-repository-assembler/src/main/java/org/apache/maven/archiva/repository/assembly/DefaultRepositoryAssembler.java
Fri Dec 1 16:37:00 2006
@@ -32,7 +32,7 @@
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
+import org.apache.commons.io.IOUtils;
import java.io.File;
import java.io.FileWriter;
@@ -268,7 +268,7 @@
}
finally
{
- IOUtil.close( writer );
+ IOUtils.closeQuietly( writer );
}
try
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?view=diff&rev=481460&r1=481459&r2=481460
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Fri Dec 1 16:37:00 2006
@@ -346,6 +346,11 @@
<artifactId>commons-lang</artifactId>
<version>2.2</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<reporting>
