From f946fbed79eece32e5435e143a445b0e03ba15aa Mon Sep 17 00:00:00 2001 From: Olivier Lamy <olamy@apache.org> Date: Tue, 18 Sep 2012 21:56:55 +0000 Subject: [PATCH] fix slf4j usage git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387376 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/archiva/web/action/MergeAction.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/MergeAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/MergeAction.java index 201c1cbbe..210aabf98 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/MergeAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/MergeAction.java @@ -48,22 +48,22 @@ import java.util.List; /** * */ -@Controller( "mergeAction" ) -@Scope( "prototype" ) +@Controller ("mergeAction") +@Scope ("prototype") public class MergeAction extends AbstractActionSupport implements Validateable, Preparable, Auditable { @Inject - @Named( value = "repositoryMerger#maven2" ) + @Named (value = "repositoryMerger#maven2") private Maven2RepositoryMerger repositoryMerger; @Inject protected ManagedRepositoryAdmin managedRepositoryAdmin; @Inject - @Named( value = "archivaTaskScheduler#repository" ) + @Named (value = "archivaTaskScheduler#repository") private RepositoryArchivaTaskScheduler repositoryTaskScheduler; private ManagedRepository repository; @@ -321,19 +321,19 @@ public class MergeAction if ( repositoryTaskScheduler.isProcessingRepositoryTask( repoid ) ) { - log.info( "Repository [" + repoid + "] task was already queued." ); + log.info( "Repository [{}] task was already queued.", repoid ); } else { 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 ); } catch ( TaskQueueException e ) { - log.warn( - "Unable to queue your request to have repository [" + repoid + "] be indexed: " + e.getMessage() ); + log.warn( "Unable to queue your request to have repository [{}] be indexed: {}", repoid, + e.getMessage() ); } } }