turn off caching in mboot for snapshot version files

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163940 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-04-13 12:32:26 +00:00
parent 30c6656f8c
commit 86536e319f
2 changed files with 20 additions and 54 deletions

View File

@ -173,7 +173,7 @@ private boolean getRemoteArtifact( Dependency dep, File destinationFile )
try
{
HttpUtils.getFile( metaUrl, new File( filename ), ignoreErrors, useTimestamp, proxyHost,
proxyPort, proxyUserName, proxyPassword, true );
proxyPort, proxyUserName, proxyPassword, false );
String version = FileUtils.fileRead( filename );
log( "Resolved version: " + version );
version = version.substring( version.lastIndexOf( "-", version.lastIndexOf( "-" ) - 1 ) + 1 );

View File

@ -52,9 +52,7 @@ public class HttpUtils
* @throws SecurityException if an operation is not authorized by the
* SecurityManager
*/
public static void useProxyUser( final String proxyHost,
final String proxyPort,
final String proxyUserName,
public static void useProxyUser( final String proxyHost, final String proxyPort, final String proxyUserName,
final String proxyPassword )
{
if ( proxyHost != null && proxyPort != null )
@ -70,7 +68,8 @@ public static void useProxyUser( final String proxyHost,
protected PasswordAuthentication getPasswordAuthentication()
{
return new PasswordAuthentication( proxyUserName,
proxyPassword == null ? new char[0] : proxyPassword.toCharArray() );
proxyPassword == null
? new char[0] : proxyPassword.toCharArray() );
}
} );
}
@ -97,26 +96,13 @@ protected PasswordAuthentication getPasswordAuthentication()
* artifact if it is available.
* @throws IOException If an I/O exception occurs.
*/
public static void getFile( String url,
File destinationFile,
boolean ignoreErrors,
boolean useTimestamp,
String proxyHost,
String proxyPort,
String proxyUserName,
String proxyPassword,
public static void getFile( String url, File destinationFile, boolean ignoreErrors, boolean useTimestamp,
String proxyHost, String proxyPort, String proxyUserName, String proxyPassword,
boolean useChecksum )
throws IOException
{
// Get the requested file.
getFile( url,
destinationFile,
ignoreErrors,
useTimestamp,
proxyHost,
proxyPort,
proxyUserName,
proxyPassword );
getFile( url, destinationFile, ignoreErrors, useTimestamp, proxyHost, proxyPort, proxyUserName, proxyPassword );
// Get the checksum if requested.
if ( useChecksum )
@ -125,13 +111,7 @@ public static void getFile( String url,
try
{
getFile( url + ".md5",
checksumFile,
ignoreErrors,
useTimestamp,
proxyHost,
proxyPort,
proxyUserName,
getFile( url + ".md5", checksumFile, ignoreErrors, useTimestamp, proxyHost, proxyPort, proxyUserName,
proxyPassword );
}
catch ( Exception e )
@ -160,14 +140,8 @@ public static void getFile( String url,
* or null
* @throws IOException If an I/O exception occurs.
*/
public static void getFile( String url,
File destinationFile,
boolean ignoreErrors,
boolean useTimestamp,
String proxyHost,
String proxyPort,
String proxyUserName,
String proxyPassword )
public static void getFile( String url, File destinationFile, boolean ignoreErrors, boolean useTimestamp,
String proxyHost, String proxyPort, String proxyUserName, String proxyPassword )
throws IOException
{
//set the timestamp to the file date.
@ -179,13 +153,7 @@ public static void getFile( String url,
try
{
getFile( url,
destinationFile,
timestamp,
proxyHost,
proxyPort,
proxyUserName,
proxyPassword );
getFile( url, destinationFile, timestamp, proxyHost, proxyPort, proxyUserName, proxyPassword );
}
catch ( IOException ex )
{
@ -212,13 +180,8 @@ public static void getFile( String url,
* or null
* @throws IOException If an I/O exception occurs.
*/
public static void getFile( String url,
File destinationFile,
long timestamp,
String proxyHost,
String proxyPort,
String proxyUserName,
String proxyPassword )
public static void getFile( String url, File destinationFile, long timestamp, String proxyHost, String proxyPort,
String proxyUserName, String proxyPassword )
throws IOException
{
String[] s = parseUrl( url );
@ -247,6 +210,8 @@ public static void getFile( String url,
connection.setRequestProperty( "Authorization", "Basic " + encoding );
}
connection.setUseCaches( timestamp >= 0 );
//connect to the remote site (may take some time)
connection.connect();
//next test for a 304 result (HTTP only)
@ -258,8 +223,10 @@ public static void getFile( String url,
// test for 404 ourselves, and throw FileNotFoundException as needed
if ( httpConnection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND )
{
throw new FileNotFoundException( url.toString() + " (HTTP Error: "
+ httpConnection.getResponseCode() + " " + httpConnection.getResponseMessage() + ")" );
throw new FileNotFoundException(
url.toString() + " (HTTP Error: " + httpConnection.getResponseCode() + " " +
httpConnection.getResponseMessage() +
")" );
}
if ( httpConnection.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED )
{
@ -301,8 +268,7 @@ public static void getFile( String url,
throw isException;
}
if ( connection.getLastModified() <= timestamp &&
connection.getLastModified() != 0 )
if ( connection.getLastModified() <= timestamp && connection.getLastModified() != 0 )
{
return;
}