You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2009/08/04 01:17:21 UTC
svn commit: r800615 -
/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
Author: ctan
Date: Mon Aug 3 23:17:20 2009
New Revision: 800615
URL: http://svn.apache.org/viewvc?rev=800615&view=rev
Log:
[CONTINUUM-2314] hide password in url when adding project fails
merge -r 800610:800613 of 1.3.x branch
Modified:
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java?rev=800615&r1=800614&r2=800615&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java Mon Aug 3 23:17:20 2009
@@ -232,38 +232,45 @@
protected File createMetadataFile( ContinuumProjectBuildingResult result, URL metadata, String username,
String password )
{
+ String url = metadata.toExternalForm();
+
+ if ( metadata.getProtocol().startsWith( "http" ) )
+ {
+ url = hidePasswordInUrl( url );
+ }
+
try
{
return createMetadataFile( metadata, username, password, result );
}
catch ( FileNotFoundException e )
{
- log.info( "URL not found: " + metadata, e );
+ log.info( "URL not found: " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_POM_NOT_FOUND );
}
catch ( MalformedURLException e )
{
- log.info( "Malformed URL: " + metadata, e );
+ log.info( "Malformed URL: " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
}
catch ( URISyntaxException e )
{
- log.info( "Malformed URL: " + metadata, e );
+ log.info( "Malformed URL: " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
}
catch ( UnknownHostException e )
{
- log.info( "Unknown host: " + metadata, e );
+ log.info( "Unknown host: " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN_HOST );
}
catch ( IOException e )
{
- log.warn( "Could not download the URL: " + metadata, e );
+ log.warn( "Could not download the URL: " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
}
catch ( HttpException e )
{
- log.warn( "Could not download the URL: " + metadata, e );
+ log.warn( "Could not download the URL: " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
}
return null;