You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ma...@apache.org on 2008/02/29 12:32:12 UTC
svn commit: r632294 - in
/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime:
PropertiesMavenRuntimeVisitor.java XMLMavenRuntimeVisitor.java
Author: markh
Date: Fri Feb 29 03:32:01 2008
New Revision: 632294
URL: http://svn.apache.org/viewvc?rev=632294&view=rev
Log:
o Use plexus IOUtil to close streams
o Parse XML using our own input stream so we can close it
o Switch off caching for XML input stream URL connection to avoid Jar file locking
Modified:
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java
maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java?rev=632294&r1=632293&r2=632294&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/PropertiesMavenRuntimeVisitor.java Fri Feb 29 03:32:01 2008
@@ -27,6 +27,8 @@
import java.util.List;
import java.util.Properties;
+import org.codehaus.plexus.util.IOUtil;
+
/**
* A visitor that parses and collects Maven project property files.
*
@@ -130,17 +132,7 @@
}
finally
{
- if ( in != null )
- {
- try
- {
- in.close();
- }
- catch ( IOException exception )
- {
- throw new MavenRuntimeException( "Cannot close project properties", exception );
- }
- }
+ IOUtil.close( in );
}
String groupId = properties.getProperty( GROUP_ID_PROPERTY );
Modified: maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java?rev=632294&r1=632293&r2=632294&view=diff
==============================================================================
--- maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java (original)
+++ maven/sandbox/trunk/shared/maven-runtime/src/main/java/org/apache/maven/shared/runtime/XMLMavenRuntimeVisitor.java Fri Feb 29 03:32:01 2008
@@ -20,7 +20,9 @@
*/
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -30,6 +32,7 @@
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectSorter;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -131,9 +134,16 @@
{
MavenXpp3Reader reader = new MavenXpp3Reader();
+ InputStream in = null;
+
try
{
- Model model = reader.read( ReaderFactory.newXmlReader( url ) );
+ URLConnection connection = url.openConnection();
+ connection.setUseCaches( false );
+
+ in = connection.getInputStream();
+
+ Model model = reader.read( ReaderFactory.newXmlReader( in ) );
return new MavenProject( model );
}
@@ -144,6 +154,10 @@
catch ( IOException exception )
{
throw new MavenRuntimeException( "Cannot read project XML", exception );
+ }
+ finally
+ {
+ IOUtil.close( in );
}
}
}