mirror of https://github.com/apache/archiva.git
fix slf4j usage
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387376 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
26302816d3
commit
f946fbed79
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action
|
@ -48,22 +48,22 @@ import java.util.List;
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@Controller( "mergeAction" )
|
@Controller ("mergeAction")
|
||||||
@Scope( "prototype" )
|
@Scope ("prototype")
|
||||||
public class MergeAction
|
public class MergeAction
|
||||||
extends AbstractActionSupport
|
extends AbstractActionSupport
|
||||||
implements Validateable, Preparable, Auditable
|
implements Validateable, Preparable, Auditable
|
||||||
{
|
{
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
@Named( value = "repositoryMerger#maven2" )
|
@Named (value = "repositoryMerger#maven2")
|
||||||
private Maven2RepositoryMerger repositoryMerger;
|
private Maven2RepositoryMerger repositoryMerger;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
protected ManagedRepositoryAdmin managedRepositoryAdmin;
|
protected ManagedRepositoryAdmin managedRepositoryAdmin;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
@Named( value = "archivaTaskScheduler#repository" )
|
@Named (value = "archivaTaskScheduler#repository")
|
||||||
private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
|
private RepositoryArchivaTaskScheduler repositoryTaskScheduler;
|
||||||
|
|
||||||
private ManagedRepository repository;
|
private ManagedRepository repository;
|
||||||
|
@ -321,19 +321,19 @@ public class MergeAction
|
||||||
|
|
||||||
if ( repositoryTaskScheduler.isProcessingRepositoryTask( repoid ) )
|
if ( repositoryTaskScheduler.isProcessingRepositoryTask( repoid ) )
|
||||||
{
|
{
|
||||||
log.info( "Repository [" + repoid + "] task was already queued." );
|
log.info( "Repository [{}] task was already queued.", repoid );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
log.info( "Your request to have repository [" + repoid + "] be indexed has been queued." );
|
log.info( "Your request to have repository [{}] be indexed has been queued.", repoid );
|
||||||
repositoryTaskScheduler.queueTask( task );
|
repositoryTaskScheduler.queueTask( task );
|
||||||
}
|
}
|
||||||
catch ( TaskQueueException e )
|
catch ( TaskQueueException e )
|
||||||
{
|
{
|
||||||
log.warn(
|
log.warn( "Unable to queue your request to have repository [{}] be indexed: {}", repoid,
|
||||||
"Unable to queue your request to have repository [" + repoid + "] be indexed: " + e.getMessage() );
|
e.getMessage() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue