MRM-708 - Migrate from Plexus Logging to Slf4J

* Finishing up AbstractLogEnabled conversions to Slf4J.



git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@629704 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 33 insertions, 28 deletions

diff --git a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
index f20293515..a74e204c4 100644
--- a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
+++ b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/DefaultArchivaTaskScheduler.java
@@ -19,6 +19,9 @@ package org.apache.maven.archiva.scheduled;
  * under the License.
  */
 
+import java.text.ParseException;
+import java.util.List;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.maven.archiva.common.ArchivaException;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
@@ -27,7 +30,6 @@ import org.apache.maven.archiva.scheduled.tasks.ArchivaTask;
 import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
 import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
 import org.apache.maven.archiva.scheduled.tasks.RepositoryTaskSelectionPredicate;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StartingException;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.StoppingException;
@@ -43,9 +45,8 @@ import org.quartz.CronTrigger;
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.SchedulerException;
-
-import java.text.ParseException;
-import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Default implementation of a scheduling component for archiva.
@@ -55,9 +56,10 @@ import java.util.List;
  * @plexus.component role="org.apache.maven.archiva.scheduled.ArchivaTaskScheduler" role-hint="default"
  */
 public class DefaultArchivaTaskScheduler
-    extends AbstractLogEnabled
     implements ArchivaTaskScheduler, Startable, RegistryListener
 {
+    private Logger log = LoggerFactory.getLogger( DefaultArchivaTaskScheduler.class );
+    
     /**
      * @plexus.requirement
      */
@@ -134,7 +136,7 @@ public class DefaultArchivaTaskScheduler
     {
         if ( repoConfig.getRefreshCronExpression() == null )
         {
-            getLogger().warn( "Skipping job, no cron expression for " + repoConfig.getId() );
+            log.warn( "Skipping job, no cron expression for " + repoConfig.getId() );
             return;
         }
 
@@ -144,7 +146,7 @@ public class DefaultArchivaTaskScheduler
         CronExpressionValidator cronValidator = new CronExpressionValidator();
         if ( !cronValidator.validate( cronString ) )
         {
-            getLogger().warn( "Cron expression [" + cronString + "] for repository [" + repoConfig.getId() +
+            log.warn( "Cron expression [" + cronString + "] for repository [" + repoConfig.getId() +
                 "] is invalid.  Defaulting to hourly." );
             cronString = CRON_HOURLY;
         }
@@ -168,7 +170,7 @@ public class DefaultArchivaTaskScheduler
         }
         catch ( ParseException e )
         {
-            getLogger().error(
+            log.error(
                 "ParseException in repository scanning cron expression, disabling repository scanning for '" +
                     repoConfig.getId() + "': " + e.getMessage() );
         }
@@ -190,7 +192,7 @@ public class DefaultArchivaTaskScheduler
         CronExpressionValidator cronValidator = new CronExpressionValidator();
         if ( !cronValidator.validate( cronString ) )
         {
-            getLogger().warn(
+            log.warn(
                 "Cron expression [" + cronString + "] for database update is invalid.  Defaulting to hourly." );
             cronString = CRON_HOURLY;
         }
@@ -203,7 +205,7 @@ public class DefaultArchivaTaskScheduler
         }
         catch ( ParseException e )
         {
-            getLogger().error(
+            log.error(
                 "ParseException in database scanning cron expression, disabling database scanning: " + e.getMessage() );
         }
 
@@ -235,7 +237,7 @@ public class DefaultArchivaTaskScheduler
         // cronExpression comes from the database scanning section
         if ( "cronExpression".equals( propertyName ) )
         {
-            getLogger().debug( "Restarting the database scheduled task after property change: " + propertyName );
+            log.debug( "Restarting the database scheduled task after property change: " + propertyName );
 
             try
             {
@@ -245,7 +247,7 @@ public class DefaultArchivaTaskScheduler
             }
             catch ( SchedulerException e )
             {
-                getLogger().error( "Error restarting the database scanning job after property change." );
+                log.error( "Error restarting the database scanning job after property change." );
             }
         }
 
@@ -269,7 +271,7 @@ public class DefaultArchivaTaskScheduler
                     }
                     catch ( SchedulerException e )
                     {
-                        getLogger().error( "error restarting job: " + REPOSITORY_JOB + ":" + repoConfig.getId() );
+                        log.error( "error restarting job: " + REPOSITORY_JOB + ":" + repoConfig.getId() );
                     }
                 }
             }
diff --git a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java
index 6a9bd191b..2c764ce12 100644
--- a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java
+++ b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaDatabaseUpdateTaskExecutor.java
@@ -22,12 +22,13 @@ package org.apache.maven.archiva.scheduled.executors;
 import org.apache.maven.archiva.database.ArchivaDatabaseException;
 import org.apache.maven.archiva.database.updater.DatabaseUpdater;
 import org.apache.maven.archiva.scheduled.tasks.DatabaseTask;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * ArchivaDatabaseTaskExecutor 
@@ -40,9 +41,10 @@ import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
  *   role-hint="database-update"
  */
 public class ArchivaDatabaseUpdateTaskExecutor
-    extends AbstractLogEnabled
     implements TaskExecutor, Initializable
 {
+    private Logger log = LoggerFactory.getLogger( ArchivaDatabaseUpdateTaskExecutor.class );
+    
     /**
      * @plexus.requirement role-hint="jdo"
      */
@@ -51,7 +53,7 @@ public class ArchivaDatabaseUpdateTaskExecutor
     public void initialize()
         throws InitializationException
     {
-        getLogger().info( "Initialized " + this.getClass().getName() );
+        log.info( "Initialized " + this.getClass().getName() );
     }
 
     public void executeTask( Task task )
@@ -59,12 +61,12 @@ public class ArchivaDatabaseUpdateTaskExecutor
     {
         DatabaseTask dbtask = (DatabaseTask) task;
 
-        getLogger().info( "Executing task from queue with job name: " + dbtask.getName() );
+        log.info( "Executing task from queue with job name: " + dbtask.getName() );
         long time = System.currentTimeMillis();
 
         try
         {
-            getLogger().info( "Task: Updating unprocessed artifacts" );
+            log.info( "Task: Updating unprocessed artifacts" );
             databaseUpdater.updateAllUnprocessed();
         }
         catch ( ArchivaDatabaseException e )
@@ -74,7 +76,7 @@ public class ArchivaDatabaseUpdateTaskExecutor
 
         try
         {
-            getLogger().info( "Task: Updating processed artifacts" );
+            log.info( "Task: Updating processed artifacts" );
             databaseUpdater.updateAllProcessed();
         }
         catch ( ArchivaDatabaseException e )
@@ -84,6 +86,6 @@ public class ArchivaDatabaseUpdateTaskExecutor
 
         time = System.currentTimeMillis() - time;
 
-        getLogger().info( "Finished database task in " + time + "ms." );
+        log.info( "Finished database task in " + time + "ms." );
     }
 }
diff --git a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
index 62e024488..f5eeb388f 100644
--- a/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
+++ b/archiva-scheduled/src/main/java/org/apache/maven/archiva/scheduled/executors/ArchivaRepositoryScanningTaskExecutor.java
@@ -19,26 +19,26 @@ package org.apache.maven.archiva.scheduled.executors;
  * under the License.
  */
 
+import java.util.List;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.database.ArchivaDAO;
-import org.apache.maven.archiva.database.ArchivaDatabaseException;
 import org.apache.maven.archiva.database.constraints.MostRecentRepositoryScanStatistics;
 import org.apache.maven.archiva.model.RepositoryContentStatistics;
 import org.apache.maven.archiva.repository.RepositoryException;
 import org.apache.maven.archiva.repository.scanner.RepositoryScanStatistics;
 import org.apache.maven.archiva.repository.scanner.RepositoryScanner;
 import org.apache.maven.archiva.scheduled.tasks.RepositoryTask;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
-
-import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * ArchivaRepositoryScanningTaskExecutor 
@@ -51,9 +51,10 @@ import java.util.List;
  *   role-hint="repository-scanning"
  */
 public class ArchivaRepositoryScanningTaskExecutor
-    extends AbstractLogEnabled
     implements TaskExecutor, Initializable
 {
+    private Logger log = LoggerFactory.getLogger( ArchivaRepositoryScanningTaskExecutor.class );
+    
     /**
      * @plexus.requirement role-hint="jdo"
      */
@@ -74,7 +75,7 @@ public class ArchivaRepositoryScanningTaskExecutor
     public void initialize()
         throws InitializationException
     {
-        getLogger().info( "Initialized " + this.getClass().getName() );
+        log.info( "Initialized " + this.getClass().getName() );
     }
 
     public void executeTask( Task task )
@@ -87,7 +88,7 @@ public class ArchivaRepositoryScanningTaskExecutor
             throw new TaskExecutionException("Unable to execute RepositoryTask with blank repository Id.");
         }
 
-        getLogger().info( "Executing task from queue with job name: " + repoTask.getName() );
+        log.info( "Executing task from queue with job name: " + repoTask.getName() );
         
         try
         {
@@ -105,7 +106,7 @@ public class ArchivaRepositoryScanningTaskExecutor
 
             RepositoryScanStatistics stats = repoScanner.scan( arepo, sinceWhen );
 
-            getLogger().info( "Finished repository task: " + stats.toDump( arepo ) );
+            log.info( "Finished repository task: " + stats.toDump( arepo ) );
             
             // I hate jpox and modello
             RepositoryContentStatistics dbstats = new RepositoryContentStatistics();