Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-06 10:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify debug code using vargars

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1398206 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-10-15 07:45:34 +00:00
parent 75575d6d38
commit ac5d5d5f47
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
View File

@ -91,7 +91,7 @@ public RepositoryModelResolver( ManagedRepository managedRepository, RepositoryP
this( new File( managedRepository.getLocation() ), pathTranslator );
this.managedRepository = managedRepository;
this.wagonFactory = wagonFactory;
this.remoteRepositories = remoteRepositories;
@ -112,7 +112,7 @@ public ModelSource resolveModel( String groupId, String artifactId, String versi
if ( !model.exists() )
{
/**
*
*
*/
// is a SNAPSHOT ? so we can try to find locally before asking remote repositories.
if ( StringUtils.contains( version, VersionUtil.SNAPSHOT ) )
@ -132,21 +132,22 @@ public ModelSource resolveModel( String groupId, String artifactId, String versi
boolean success = getModelFromProxy( remoteRepository, groupId, artifactId, version, filename );
if ( success && model.exists() )
{
log.info(
"Model '{}' successfully retrieved from remote repository '{}'",
model.getAbsolutePath(), remoteRepository.getId() );
log.info( "Model '{}' successfully retrieved from remote repository '{}'",
model.getAbsolutePath(), remoteRepository.getId() );
break;
}
}
catch ( ResourceDoesNotExistException e )
{
log.info( "An exception was caught while attempting to retrieve model '{}' from remote repository '{}'.Reason:{}",
new Object[]{ model.getAbsolutePath(), remoteRepository.getId(), e.getMessage() } );
log.info(
"An exception was caught while attempting to retrieve model '{}' from remote repository '{}'.Reason:{}",
new Object[]{ model.getAbsolutePath(), remoteRepository.getId(), e.getMessage() } );
}
catch ( Exception e )
{
log.warn( "An exception was caught while attempting to retrieve model '{}' from remote repository '{}'.Reason:{}",
new Object[]{ model.getAbsolutePath(), remoteRepository.getId(), e.getMessage() } );
log.warn(
"An exception was caught while attempting to retrieve model '{}' from remote repository '{}'.Reason:{}",
new Object[]{ model.getAbsolutePath(), remoteRepository.getId(), e.getMessage() } );
continue;
}
@ -176,11 +177,10 @@ protected File findTimeStampedSnapshotPom( String groupId, String artifactId, St
StringUtils.replaceChars( groupId, '.', '/' ) + '/' + artifactId + '/' + version + '/'
+ artifactId + '-' + StringUtils.remove( version, "-SNAPSHOT" ) + '-' + lastVersion + '-'
+ buildNumber + ".pom";
if ( log.isDebugEnabled() )
{
log.debug( "use snapshot path {} for maven coordinate {}", snapshotPath,
groupId + ":" + artifactId + ":" + version );
}
log.debug( "use snapshot path {} for maven coordinate {}:{}:{}", snapshotPath, groupId, artifactId,
version );
File model = new File( basedir, snapshotPath );
//model = pathTranslator.toFile( basedir, groupId, artifactId, lastVersion, filename );
if ( model.exists() )
@ -401,12 +401,12 @@ private boolean connectToRepository( Wagon wagon, RemoteRepository remoteReposit
}
catch ( ConnectionException e )
{
log.error( "Could not connect to {}:{} ",remoteRepository.getName(), e.getMessage() );
log.error( "Could not connect to {}:{} ", remoteRepository.getName(), e.getMessage() );
connected = false;
}
catch ( AuthenticationException e )
{
log.error( "Could not connect to {}:{} ",remoteRepository.getName(), e.getMessage() );
log.error( "Could not connect to {}:{} ", remoteRepository.getName(), e.getMessage() );
connected = false;
}
@ -464,8 +464,8 @@ private void moveFileIfExists( File fileToMove, File directory )
{
if ( newLocation.exists() )
{
log.error( "Tried to copy file {} to {} but file with this name already exists.",
fileToMove.getName(), newLocation.getAbsolutePath() );
log.error( "Tried to copy file {} to {} but file with this name already exists.",
fileToMove.getName(), newLocation.getAbsolutePath() );
}
else
{