continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r730078 [1/2] - in /continuum/trunk/continuum-core/src: main/java/org/apache/continuum/repository/ main/java/org/apache/continuum/taskqueue/manager/ main/java/org/apache/maven/continuum/ main/java/org/apache/maven/continuum/build/settings/ ...
Date Tue, 30 Dec 2008 09:32:55 GMT
Author: evenisse
Date: Tue Dec 30 01:32:54 2008
New Revision: 730078

URL: http://svn.apache.org/viewvc?rev=730078&view=rev
Log:
Remove AbstractLogEnabled

Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java
    continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java
    continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java Tue Dec 30 01:32:54 2008
@@ -29,7 +29,8 @@
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
@@ -42,9 +43,10 @@
  * @since 25 jul 07
  */
 public class DefaultRepositoryService
-    extends AbstractLogEnabled
     implements RepositoryService
 {
+    private Logger log = LoggerFactory.getLogger( DefaultRepositoryService.class );
+
     /**
      * @plexus.requirement
      */
@@ -91,7 +93,7 @@
 
             repository = localRepositoryDao.addLocalRepository( localRepository );
 
-            getLogger().info( "Added new local repository: " + repository.getName() );
+            log.info( "Added new local repository: " + repository.getName() );
         }
         catch ( ContinuumStoreException e )
         {
@@ -118,7 +120,7 @@
                 taskQueueManager.removeRepositoryFromPurgeQueue( repositoryId );
             }
 
-            getLogger().info( "Remove purge configurations of " + repository.getName() );
+            log.info( "Remove purge configurations of " + repository.getName() );
             removePurgeConfigurationsOfRepository( repositoryId );
 
             List<ProjectGroup> groups = projectGroupDao.getProjectGroupByRepository( repositoryId );
@@ -131,7 +133,7 @@
 
             localRepositoryDao.removeLocalRepository( repository );
 
-            getLogger().info( "Removed local repository: " + repository.getName() );
+            log.info( "Removed local repository: " + repository.getName() );
         }
         catch ( TaskQueueManagerException e )
         {
@@ -158,7 +160,7 @@
 
             localRepositoryDao.updateLocalRepository( localRepository );
 
-            getLogger().info( "Updated local repository: " + localRepository.getName() );
+            log.info( "Updated local repository: " + localRepository.getName() );
         }
         catch ( TaskQueueManagerException e )
         {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java Tue Dec 30 01:32:54 2008
@@ -1,5 +1,24 @@
 package org.apache.continuum.taskqueue.manager;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -24,22 +43,24 @@
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.TaskQueue;
 import org.codehaus.plexus.taskqueue.TaskQueueException;
 import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
  * @plexus.component role="org.apache.continuum.taskqueue.manager.TaskQueueManager" role-hint="default"
  */
 public class DefaultTaskQueueManager
-    extends AbstractLogEnabled
     implements TaskQueueManager, Contextualizable
 {
+    private Logger log = LoggerFactory.getLogger( DefaultTaskQueueManager.class );
+
     /**
      * @plexus.requirement role-hint="build-project"
      */
@@ -101,23 +122,23 @@
             {
                 if ( ( (BuildProjectTask) currentTask ).getProjectId() == projectId )
                 {
-                    getLogger().info( "Cancelling task for project " + projectId );
+                    log.info( "Cancelling task for project " + projectId );
                     getBuildTaskQueueExecutor().cancelTask( currentTask );
                 }
                 else
                 {
-                    getLogger().warn( "Current task is not for the given projectId (" + projectId + "): "
+                    log.warn( "Current task is not for the given projectId (" + projectId + "): "
                                           + ( (BuildProjectTask) currentTask ).getProjectId() + "; not cancelling" );
                 }
             }
             else
             {
-                getLogger().warn( "Current task not a BuildProjectTask - not cancelling" );
+                log.warn( "Current task not a BuildProjectTask - not cancelling" );
             }
         }
         else
         {
-            getLogger().warn( "No task running - not cancelling" );
+            log.warn( "No task running - not cancelling" );
         }
     }
 
@@ -132,23 +153,23 @@
             {
                 if ( ( (CheckOutTask) task ).getProjectId() == projectId )
                 {
-                    getLogger().info( "Cancelling checkout for project " + projectId );
+                    log.info( "Cancelling checkout for project " + projectId );
                     return getCheckoutTaskQueueExecutor().cancelTask( task );
                 }
                 else
                 {
-                    getLogger().warn( "Current task is not for the given projectId (" + projectId + "): "
+                    log.warn( "Current task is not for the given projectId (" + projectId + "): "
                                           + ( (CheckOutTask) task ).getProjectId() + "; not cancelling checkout" );
                 }
             }
             else
             {
-                getLogger().warn( "Current task not a CheckOutTask - not cancelling checkout" );
+                log.warn( "Current task not a CheckOutTask - not cancelling checkout" );
             }
         }
         else
         {
-            getLogger().warn( "No task running - not cancelling checkout" );
+            log.warn( "No task running - not cancelling checkout" );
         }
         return false;
     }
@@ -162,17 +183,17 @@
         {
             if ( task instanceof BuildProjectTask )
             {
-                getLogger().info( "Cancelling current build task" );
+                log.info( "Cancelling current build task" );
                 return getBuildTaskQueueExecutor().cancelTask( task );
             }
             else
             {
-                getLogger().warn( "Current task not a BuildProjectTask - not cancelling" );
+                log.warn( "Current task not a BuildProjectTask - not cancelling" );
             }
         }
         else
         {
-            getLogger().warn( "No task running - not cancelling" );
+            log.warn( "No task running - not cancelling" );
         }
         return false;
     }
@@ -558,7 +579,7 @@
 
         for ( BuildProjectTask buildProjectTask : tasks )
         {
-            getLogger().info( "cancel build for project " + buildProjectTask.getProjectId() );
+            log.info( "cancel build for project " + buildProjectTask.getProjectId() );
         }
         if ( !tasks.isEmpty() )
         {

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Dec 30 01:32:54 2008
@@ -92,7 +92,6 @@
 import org.codehaus.plexus.action.ActionNotFoundException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -103,6 +102,8 @@
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -111,9 +112,10 @@
  * @plexus.component role="org.apache.maven.continuum.Continuum" role-hint="default"
  */
 public class DefaultContinuum
-    extends AbstractLogEnabled
     implements Continuum, Contextualizable, Initializable, Startable
 {
+    private Logger log = LoggerFactory.getLogger( DefaultContinuum.class );
+
     /**
      * @plexus.requirement
      */
@@ -374,7 +376,7 @@
             }
         }
 
-        getLogger().info( "Remove project group " + projectGroup.getName() + "(" + projectGroup.getId() + ")" );
+        log.info( "Remove project group " + projectGroup.getName() + "(" + projectGroup.getId() + ")" );
 
         Map context = new HashMap();
         context.put( AbstractContinuumAction.KEY_PROJECT_GROUP_ID, new Integer( projectGroup.getId() ) );
@@ -417,7 +419,7 @@
                 context.put( AbstractContinuumAction.KEY_PROJECT_GROUP_ID, new Integer( new_pg.getId() ) );
                 executeAction( "add-assignable-roles", context );
 
-                getLogger().info( "Added new project group: " + new_pg.getName() );
+                log.info( "Added new project group: " + new_pg.getName() );
             }
             catch ( BuildDefinitionServiceException e )
             {
@@ -600,7 +602,7 @@
                 throw logAndCreateException( "Error while deleting project group release output directory.", e );
             }
 
-            getLogger().info( "Remove project " + project.getName() + "(" + projectId + ")" );
+            log.info( "Remove project " + project.getName() + "(" + projectId + ")" );
 
             try
             {
@@ -744,7 +746,7 @@
         }
         catch ( CycleDetectedException e )
         {
-            getLogger().warn( "Cycle detected while sorting projects for building, falling back to unsorted build." );
+            log.warn( "Cycle detected while sorting projects for building, falling back to unsorted build." );
 
             projectsList = getProjects();
         }
@@ -770,7 +772,7 @@
         }
         catch ( CycleDetectedException e )
         {
-            getLogger().warn( "Cycle detected while sorting projects for building, falling back to unsorted build." );
+            log.warn( "Cycle detected while sorting projects for building, falling back to unsorted build." );
 
             projectsList = getProjects();
         }
@@ -831,7 +833,7 @@
         }
         catch ( CycleDetectedException e )
         {
-            getLogger().warn( "Cycle detected while sorting projects for building, falling back to unsorted build." );
+            log.warn( "Cycle detected while sorting projects for building, falling back to unsorted build." );
 
             projectsList = getProjects();
         }
@@ -860,7 +862,7 @@
 
             if ( projectsMap == null || projectsMap.size() == 0 )
             {
-                getLogger().debug( "no builds attached to schedule" );
+                log.debug( "no builds attached to schedule" );
                 // We don't have projects attached to this schedule
                 return;
             }
@@ -873,7 +875,7 @@
         }
         catch ( CycleDetectedException e )
         {
-            getLogger().warn( "Cycle detected while sorting projects for building, falling back to unsorted build." );
+            log.warn( "Cycle detected while sorting projects for building, falling back to unsorted build." );
 
             projectsList = getProjects();
         }
@@ -1030,11 +1032,11 @@
         }
         catch ( ConfigurationException e )
         {
-            getLogger().info( "skip error during cleanup build files " + e.getMessage(), e );
+            log.info( "skip error during cleanup build files " + e.getMessage(), e );
         }
         catch ( IOException e )
         {
-            getLogger().info( "skip IOException during cleanup build files " + e.getMessage(), e );
+            log.info( "skip IOException during cleanup build files " + e.getMessage(), e );
         }
 
     }
@@ -1171,7 +1173,7 @@
             return new ArrayList<Project>();
         }
 
-        return ProjectSorter.getSortedProjects( projects, getLogger() );
+        return ProjectSorter.getSortedProjects( projects, log );
     }
 
     // ----------------------------------------------------------------------
@@ -1499,17 +1501,17 @@
         ContinuumProjectBuildingResult result = (ContinuumProjectBuildingResult) context
             .get( CreateProjectsFromMetadataAction.KEY_PROJECT_BUILDING_RESULT );
 
-        if ( getLogger().isInfoEnabled() )
+        if ( log.isInfoEnabled() )
         {
             if ( result.getProjects() != null )
             {
-                getLogger().info( "Created " + result.getProjects().size() + " projects." );
+                log.info( "Created " + result.getProjects().size() + " projects." );
             }
             if ( result.getProjectGroups() != null )
             {
-                getLogger().info( "Created " + result.getProjectGroups().size() + " project groups." );
+                log.info( "Created " + result.getProjectGroups().size() + " project groups." );
             }
-            getLogger().info( result.getErrors().size() + " errors." );
+            log.info( result.getErrors().size() + " errors." );
 
             // ----------------------------------------------------------------------
             // Look for any errors.
@@ -1517,8 +1519,8 @@
 
             if ( result.hasErrors() )
             {
-                getLogger().info( result.getErrors().size() + " errors during project add: " );
-                getLogger().info( result.getErrorsAsString() );
+                log.info( result.getErrors().size() + " errors during project add: " );
+                log.info( result.getErrorsAsString() );
                 return result;
             }
         }
@@ -1552,12 +1554,12 @@
 
                     projectGroupId = projectGroup.getId();
 
-                    getLogger().info(
+                    log.info(
                         "Using existing project group with the group id: '" + projectGroup.getGroupId() + "'." );
                 }
                 catch ( ContinuumObjectNotFoundException e )
                 {
-                    getLogger().info(
+                    log.info(
                         "Creating project group with the group id: '" + projectGroup.getGroupId() + "'." );
 
                     Map pgContext = new HashMap();
@@ -2280,7 +2282,7 @@
             }
             catch ( SchedulesActivationException e )
             {
-                getLogger().error( "Can't unactivate schedule. You need to restart Continuum.", e );
+                log.error( "Can't unactivate schedule. You need to restart Continuum.", e );
             }
         }
     }
@@ -2314,7 +2316,7 @@
         }
         catch ( SchedulesActivationException e )
         {
-            getLogger().error( "Can't unactivate the schedule. You need to restart Continuum.", e );
+            log.error( "Can't unactivate the schedule. You need to restart Continuum.", e );
         }
 
         try
@@ -2323,7 +2325,7 @@
         }
         catch ( Exception e )
         {
-            getLogger().error( "Can't remove the schedule.", e );
+            log.error( "Can't remove the schedule.", e );
 
             try
             {
@@ -2331,7 +2333,7 @@
             }
             catch ( SchedulesActivationException sae )
             {
-                getLogger().error( "Can't reactivate the schedule. You need to restart Continuum.", e );
+                log.error( "Can't reactivate the schedule. You need to restart Continuum.", e );
             }
             throw new ContinuumException( "Can't remove the schedule", e );
         }
@@ -2481,7 +2483,7 @@
     public void initialize()
         throws InitializationException
     {
-        getLogger().info( "Initializing Continuum." );
+        log.info( "Initializing Continuum." );
 
         File wdFile = new File( workingDirectory );
 
@@ -2502,7 +2504,7 @@
             }
         }
 
-        getLogger().info( "Showing all groups:" );
+        log.info( "Showing all groups:" );
         try
         {
             for ( ProjectGroup group : projectGroupDao.getAllProjectGroups() )
@@ -2515,7 +2517,7 @@
             throw new InitializationException( "Error while creating project scm root for the project group", e );
         }
 
-        getLogger().info( "Showing all projects: " );
+        log.info( "Showing all projects: " );
 
         for ( Project project : projectDao.getAllProjectsByNameWithBuildDetails() )
         {
@@ -2547,7 +2549,7 @@
 
                 try
                 {
-                    getLogger().info( "Fix project state for project " + project.getId() + ":" + project.getName() +
+                    log.info( "Fix project state for project " + project.getId() + ":" + project.getName() +
                         ":" + project.getVersion() );
 
                     projectDao.updateProject( project );
@@ -2556,7 +2558,7 @@
 
                     if ( state == p.getState() )
                     {
-                        getLogger().info( "Can't fix the project state." );
+                        log.info( "Can't fix the project state." );
                     }
                 }
                 catch ( ContinuumStoreException e )
@@ -2565,7 +2567,7 @@
                 }
             }
 
-            getLogger().info( " " + project.getId() + ":" + project.getName() + ":" + project.getVersion() + ":" +
+            log.info( " " + project.getId() + ":" + project.getName() + ":" + project.getVersion() + ":" +
                 project.getExecutorId() );
         }
 
@@ -2579,7 +2581,7 @@
 
                 try
                 {
-                    getLogger().info( "Fix state for projectScmRoot " + projectScmRoot.getScmRootAddress() );
+                    log.info( "Fix state for projectScmRoot " + projectScmRoot.getScmRootAddress() );
                     
                     projectScmRootDao.updateProjectScmRoot( projectScmRoot );
                 }
@@ -2634,7 +2636,7 @@
         catch ( SchedulesActivationException e )
         {
             // We don't throw an exception here, so users will can modify schedules in interface instead of database
-            getLogger().error( "Error activating schedules.", e );
+            log.error( "Error activating schedules.", e );
         }
     }
 
@@ -2683,7 +2685,7 @@
         }
         catch ( Exception e )
         {
-            getLogger().info( "Error storing the Continuum configuration.", e );
+            log.info( "Error storing the Continuum configuration.", e );
         }
 
         closeStore();
@@ -2728,7 +2730,7 @@
         }
         catch ( Exception e )
         {
-            getLogger().info( "exception", e );
+            log.info( "exception", e );
             throw new ContinuumException( "Error while executing the action '" + actionName + "'.", e );
         }
     }
@@ -2744,7 +2746,7 @@
             return new ContinuumException( "No such object.", cause );
         }
 
-        getLogger().error( message, cause );
+        log.error( message, cause );
 
         return new ContinuumException( message, cause );
     }
@@ -2976,7 +2978,7 @@
 
     private void startMessage()
     {
-        getLogger().info( "Starting Continuum." );
+        log.info( "Starting Continuum." );
 
         // ----------------------------------------------------------------------
         //
@@ -2984,27 +2986,27 @@
 
         String banner = StringUtils.repeat( "-", getVersion().length() );
 
-        getLogger().info( "" );
-        getLogger().info( "" );
-        getLogger().info( "< Continuum " + getVersion() + " started! >" );
-        getLogger().info( "-----------------------" + banner );
-        getLogger().info( "       \\   ^__^" );
-        getLogger().info( "        \\  (oo)\\_______" );
-        getLogger().info( "           (__)\\       )\\/\\" );
-        getLogger().info( "               ||----w |" );
-        getLogger().info( "               ||     ||" );
-        getLogger().info( "" );
-        getLogger().info( "" );
+        log.info( "" );
+        log.info( "" );
+        log.info( "< Continuum " + getVersion() + " started! >" );
+        log.info( "-----------------------" + banner );
+        log.info( "       \\   ^__^" );
+        log.info( "        \\  (oo)\\_______" );
+        log.info( "           (__)\\       )\\/\\" );
+        log.info( "               ||----w |" );
+        log.info( "               ||     ||" );
+        log.info( "" );
+        log.info( "" );
     }
 
     private void stopMessage()
     {
         // Yes dorothy, this can happen!
-        if ( getLogger() != null )
+        if ( log != null )
         {
-            getLogger().info( "Stopping Continuum." );
+            log.info( "Stopping Continuum." );
 
-            getLogger().info( "Continuum stopped." );
+            log.info( "Continuum stopped." );
         }
     }
 
@@ -3108,7 +3110,7 @@
         }
         catch ( ConfigurationException e )
         {
-            getLogger().info( "skip error during cleanup release files " + e.getMessage(), e );
+            log.info( "skip error during cleanup release files " + e.getMessage(), e );
         }
     }
 
@@ -3261,24 +3263,24 @@
                 }
                 catch ( ContinuumObjectNotFoundException e )
                 {
-                    getLogger().debug( e.getMessage() );
+                    log.debug( e.getMessage() );
                 }
                 catch ( ContinuumStoreException e )
                 {
-                    getLogger().debug( e.getMessage() );
+                    log.debug( e.getMessage() );
                 }
 
                 if ( projectDefaultBD != null )
                 {
                     buildDefId = projectDefaultBD.getId();
-                    getLogger().debug( "Project " + project.getId() +
+                    log.debug( "Project " + project.getId() +
                         " has own default build definition, will use it instead of group's." );
                 }
             }
 
             if ( buildDefId == -1 )
             {
-                getLogger().info( "Project " + projectId +
+                log.info( "Project " + projectId +
                     " don't have a default build definition defined in the project or project group, will not be included in group prepare." );
                 continue;
             }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java Tue Dec 30 01:32:54 2008
@@ -32,7 +32,6 @@
 import org.apache.maven.continuum.scheduler.ContinuumPurgeJob;
 import org.apache.maven.continuum.scheduler.ContinuumSchedulerConstants;
 import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.scheduler.AbstractJob;
 import org.codehaus.plexus.scheduler.Scheduler;
 import org.codehaus.plexus.util.StringUtils;
@@ -40,6 +39,8 @@
 import org.quartz.JobDataMap;
 import org.quartz.JobDetail;
 import org.quartz.SchedulerException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.text.ParseException;
 import java.util.Collection;
@@ -52,9 +53,10 @@
  * @plexus.component role="org.apache.maven.continuum.build.settings.SchedulesActivator"
  */
 public class DefaultSchedulesActivator
-    extends AbstractLogEnabled
     implements SchedulesActivator
 {
+    private Logger log = LoggerFactory.getLogger( DefaultSchedulesActivator.class );
+
     /**
      * @plexus.requirement
      */
@@ -86,7 +88,7 @@
     public void activateSchedules( Continuum continuum )
         throws SchedulesActivationException
     {
-        getLogger().info( "Activating schedules ..." );
+        log.info( "Activating schedules ..." );
 
         Collection<Schedule> schedules = scheduleDao.getAllSchedulesByName();
 
@@ -96,7 +98,7 @@
             {
                 // TODO: this can possibly be removed but it's here now to
                 // weed out any bugs
-                getLogger().info( "Not scheduling " + schedule.getName() );
+                log.info( "Not scheduling " + schedule.getName() );
 
                 continue;
             }
@@ -116,7 +118,7 @@
             }
             catch ( SchedulesActivationException e )
             {
-                getLogger().error( "Can't activate schedule '" + schedule.getName() + "'", e );
+                log.error( "Can't activate schedule '" + schedule.getName() + "'", e );
 
                 schedule.setActive( false );
 
@@ -136,7 +138,7 @@
     public void activateSchedule( Schedule schedule, Continuum continuum )
         throws SchedulesActivationException
     {
-        getLogger().info( "Activating schedule " + schedule.getName() );
+        log.info( "Activating schedule " + schedule.getName() );
 
         if ( isScheduleFromBuildJob( schedule ) )
         {
@@ -152,7 +154,7 @@
     public void unactivateSchedule( Schedule schedule, Continuum continuum )
         throws SchedulesActivationException
     {
-        getLogger().info( "Deactivating schedule " + schedule.getName() );
+        log.info( "Deactivating schedule " + schedule.getName() );
 
         unschedule( schedule, continuum );
     }
@@ -162,7 +164,7 @@
     {
         if ( !schedule.isActive() )
         {
-            getLogger().info( "Schedule \"" + schedule.getName() + "\" is disabled." );
+            log.info( "Schedule \"" + schedule.getName() + "\" is disabled." );
 
             return;
         }
@@ -171,7 +173,7 @@
 
         dataMap.put( "continuum", continuum );
 
-        dataMap.put( AbstractJob.LOGGER, getLogger() );
+        dataMap.put( AbstractJob.LOGGER, log );
 
         dataMap.put( ContinuumSchedulerConstants.SCHEDULE, schedule );
 
@@ -208,7 +210,7 @@
         {
             scheduler.scheduleJob( jobDetail, trigger );
 
-            getLogger().info( trigger.getName() + ": next fire time ->" + trigger.getNextFireTime() );
+            log.info( trigger.getName() + ": next fire time ->" + trigger.getNextFireTime() );
         }
         catch ( SchedulerException e )
         {
@@ -223,7 +225,7 @@
         {
             if ( schedule.isActive() )
             {
-                getLogger().info( "Stopping active schedule \"" + schedule.getName() + "\"." );
+                log.info( "Stopping active schedule \"" + schedule.getName() + "\"." );
 
                 scheduler.interruptSchedule( schedule.getName(), org.quartz.Scheduler.DEFAULT_GROUP );
             }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/BuildProjectTaskExecutor.java Tue Dec 30 01:32:54 2008
@@ -20,7 +20,6 @@
  */
 
 import org.apache.maven.continuum.buildqueue.BuildProjectTask;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.taskqueue.Task;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
@@ -30,7 +29,6 @@
  * @version $Id$
  */
 public class BuildProjectTaskExecutor
-    extends AbstractLogEnabled
     implements TaskExecutor
 {
     /**

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Tue Dec 30 01:32:54 2008
@@ -45,8 +45,9 @@
 import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.codehaus.plexus.action.ActionManager;
 import org.codehaus.plexus.action.ActionNotFoundException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -59,9 +60,10 @@
  * @plexus.component role="org.apache.maven.continuum.buildcontroller.BuildController" role-hint="default"
  */
 public class DefaultBuildController
-    extends AbstractLogEnabled
     implements BuildController
 {
+    private Logger log = LoggerFactory.getLogger( DefaultBuildController.class );
+
     /**
      * @plexus.requirement
      */
@@ -120,17 +122,17 @@
     public void build( int projectId, int buildDefinitionId, int trigger )
         throws TaskExecutionException
     {
-        getLogger().info( "Initializing build" );
+        log.info( "Initializing build" );
         BuildContext context = initializeBuildContext( projectId, buildDefinitionId, trigger );
 
         // ignore this if AlwaysBuild ?
         if ( !checkScmResult( context ) )
         {
-            getLogger().info( "Error updating from SCM, not building" );
+            log.info( "Error updating from SCM, not building" );
             return;
         }
         
-        getLogger().info( "Starting build of " + context.getProject().getName() );
+        log.info( "Starting build of " + context.getProject().getName() );
         startBuild( context );
 
         try
@@ -153,7 +155,7 @@
                 updateBuildResult( context, ContinuumUtils.throwableToString( e ) );
 
                 //just log the error but don't stop the build from progressing in order not to suppress any build result messages there
-                getLogger().error( "Error executing action update-project-from-working-directory '", e );
+                log.error( "Error executing action update-project-from-working-directory '", e );
             }
 
             performAction( "execute-builder", context );
@@ -390,7 +392,7 @@
 
         try
         {
-            getLogger().info( "Performing action " + actionName );
+            log.info( "Performing action " + actionName );
             actionManager.lookup( actionName ).execute( context.getActionContext() );
             return;
         }
@@ -429,7 +431,7 @@
         }
         catch ( TaskExecutionException e )
         {
-            getLogger().error( "Error updating build result after receiving the following exception: ", exception );
+            log.error( "Error updating build result after receiving the following exception: ", exception );
             throw e;
         }
 
@@ -442,17 +444,17 @@
         BuildDefinition buildDefinition = context.getBuildDefinition();
         if ( buildDefinition.isBuildFresh() )
         {
-            getLogger().info( "FreshBuild configured, building" );
+            log.info( "FreshBuild configured, building" );
             return true;
         }
         if ( buildDefinition.isAlwaysBuild() )
         {
-            getLogger().info( "AlwaysBuild configured, building" );
+            log.info( "AlwaysBuild configured, building" );
             return true;
         }
         if ( context.getOldBuildResult() == null )
         {
-            getLogger().info( "The project was never be built with the current build definition, building" );
+            log.info( "The project was never be built with the current build definition, building" );
             return true;
         }
 
@@ -462,13 +464,13 @@
         if ( project.getOldState() == ContinuumProjectState.ERROR ||
             context.getOldBuildResult().getState() == ContinuumProjectState.ERROR )
         {
-            getLogger().info( "Latest state was 'ERROR', building" );
+            log.info( "Latest state was 'ERROR', building" );
             return true;
         }
 
         if ( context.getTrigger() == ContinuumProjectState.TRIGGER_FORCED )
         {
-            getLogger().info( "The project build is forced, building" );
+            log.info( "The project build is forced, building" );
             return true;
         }
 
@@ -488,12 +490,12 @@
             {
                 if ( !context.getScmResult().getChanges().isEmpty() )
                 {
-                    getLogger().info(
+                    log.info(
                         "The project was not built because all changes are unknown (maybe local modifications or ignored files not defined in your SCM tool." );
                 }
                 else
                 {
-                    getLogger().info(
+                    log.info(
                         "The project was not built because no changes were detected in sources since the last build." );
                 }
             }
@@ -501,7 +503,7 @@
             // Check dependencies changes
             if ( context.getModifiedDependencies() != null && !context.getModifiedDependencies().isEmpty() )
             {
-                getLogger().info( "Found dependencies changes, building" );
+                log.info( "Found dependencies changes, building" );
                 shouldBuild = true;
             }
         }
@@ -526,7 +528,7 @@
 
         if ( shouldBuild )
         {
-            getLogger().info( "Changes found in the current project, building" );
+            log.info( "Changes found in the current project, building" );
         }
         else
         {
@@ -542,7 +544,7 @@
             {
                 throw new TaskExecutionException( "Error storing project", e );
             }
-            getLogger().info( "No changes in the current project, not building" );
+            log.info( "No changes in the current project, not building" );
 
         }
 
@@ -628,19 +630,19 @@
                                                                                            context.getOldBuildResult().getEndTime() );
                     if ( buildResults != null && !buildResults.isEmpty() )
                     {
-                        getLogger().debug( "Dependency changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" +
+                        log.debug( "Dependency changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" +
                             dep.getVersion() );
                         modifiedDependencies.add( dep );
                     }
                     else
                     {
-                        getLogger().debug( "Dependency not changed: " + dep.getGroupId() + ":" + dep.getArtifactId() +
+                        log.debug( "Dependency not changed: " + dep.getGroupId() + ":" + dep.getArtifactId() +
                             ":" + dep.getVersion() );
                     }
                 }
                 else
                 {
-                    getLogger().debug( "Skip non Continuum project: " + dep.getGroupId() + ":" + dep.getArtifactId() +
+                    log.debug( "Skip non Continuum project: " + dep.getGroupId() + ":" + dep.getArtifactId() +
                         ":" + dep.getVersion() );
                 }
             }
@@ -650,7 +652,7 @@
         }
         catch ( ContinuumStoreException e )
         {
-            getLogger().warn( "Can't get the project dependencies", e );
+            log.warn( "Can't get the project dependencies", e );
         }
     }
 

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java Tue Dec 30 01:32:54 2008
@@ -33,9 +33,10 @@
 import org.apache.maven.continuum.model.project.Schedule;
 import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
 import org.apache.maven.continuum.store.ContinuumStoreException;
-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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -49,9 +50,10 @@
  * @since 15 sept. 07
  */
 public class DefaultBuildDefinitionService
-    extends AbstractLogEnabled
     implements BuildDefinitionService, Initializable
 {
+    private Logger log = LoggerFactory.getLogger( DefaultBuildDefinitionService.class );
+
     /**
      * @plexus.configuration default-value=""
      */
@@ -272,7 +274,7 @@
         {
             return template;
         }
-        getLogger().info( "create default AntBuildDefinitionTemplate" );
+        log.info( "create default AntBuildDefinitionTemplate" );
         template = new BuildDefinitionTemplate();
         template.setContinuumDefault( true );
         template.setName( "Default Ant Template" );
@@ -307,10 +309,10 @@
             getContinuumDefaultWithType( ContinuumBuildExecutorConstants.MAVEN_ONE_BUILD_EXECUTOR );
         if ( template != null )
         {
-            getLogger().debug( "found default maven template " + template.getType() );
+            log.debug( "found default maven template " + template.getType() );
             return template;
         }
-        getLogger().info( "create default MavenOneBuildDefinitionTemplate" );
+        log.info( "create default MavenOneBuildDefinitionTemplate" );
         template = new BuildDefinitionTemplate();
         template.setContinuumDefault( true );
         template.setName( "Default Maven 1 Template" );
@@ -348,7 +350,7 @@
         {
             return template;
         }
-        getLogger().info( "create default MavenTwoBuildDefinitionTemplate" );
+        log.info( "create default MavenTwoBuildDefinitionTemplate" );
         template = new BuildDefinitionTemplate();
         template.setContinuumDefault( true );
         template.setName( "Default Maven 2 Template" );
@@ -386,7 +388,7 @@
         {
             return template;
         }
-        getLogger().info( "create default ShellBuildDefinitionTemplate" );
+        log.info( "create default ShellBuildDefinitionTemplate" );
         template = new BuildDefinitionTemplate();
         template.setContinuumDefault( true );
         template.setName( "Default Shell Template" );

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java Tue Dec 30 01:32:54 2008
@@ -21,7 +21,6 @@
 
 import org.apache.maven.continuum.buildqueue.BuildProjectTask;
 import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.taskqueue.TaskViabilityEvaluator;
 
 import java.util.ArrayList;
@@ -36,7 +35,6 @@
  * @version $Id$
  */
 public class BuildProjectTaskViabilityEvaluator
-    extends AbstractLogEnabled
     implements TaskViabilityEvaluator
 {
     /**

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Tue Dec 30 01:32:54 2008
@@ -31,7 +31,6 @@
 import org.apache.maven.continuum.project.ContinuumProjectState;
 import org.apache.maven.continuum.utils.WorkingDirectoryService;
 import org.codehaus.plexus.commandline.ExecutableResolver;
-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.util.StringUtils;
@@ -51,11 +50,9 @@
  * @version $Id$
  */
 public abstract class AbstractBuildExecutor
-    extends AbstractLogEnabled
     implements ContinuumBuildExecutor, Initializable
 {
-    
-    protected Logger logger = LoggerFactory.getLogger( getClass() );
+    protected Logger log = LoggerFactory.getLogger( getClass() );
     
     private static final String SUDO_EXECUTABLE = "sudo";
 
@@ -157,7 +154,7 @@
         {
             if ( StringUtils.isEmpty( defaultExecutable ) )
             {
-                getLogger().warn( "The default executable for build executor '" + id + "' is not set. " +
+                log.warn( "The default executable for build executor '" + id + "' is not set. " +
                     "This will cause a problem unless the project has a executable configured." );
             }
             else
@@ -166,12 +163,12 @@
 
                 if ( resolvedExecutable == null )
                 {
-                    getLogger().warn(
+                    log.warn(
                         "Could not find the executable '" + defaultExecutable + "' in the " + "path '" + path + "'." );
                 }
                 else
                 {
-                    getLogger().info( "Resolved the executable '" + defaultExecutable + "' to " + "'" +
+                    log.info( "Resolved the executable '" + defaultExecutable + "' to " + "'" +
                         resolvedExecutable.getAbsolutePath() + "'." );
                 }
             }
@@ -216,11 +213,11 @@
 
             if ( e == null )
             {
-                getLogger().warn( "Could not find the executable '" + executable + "' in this path: " );
+                log.warn( "Could not find the executable '" + executable + "' in this path: " );
 
                 for ( String element : path )
                 {
-                    getLogger().warn( element );
+                    log.warn( element );
                 }
 
                 actualExecutable = defaultExecutable;
@@ -283,7 +280,7 @@
                                                                                   arguments, output, project.getId(),
                                                                                   environments );
 
-            getLogger().info( "Exit code: " + result.getExitCode() );
+            log.info( "Exit code: " + result.getExitCode() );
 
             return new ContinuumBuildExecutionResult( output, result.getExitCode() );
         }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java Tue Dec 30 01:32:54 2008
@@ -21,8 +21,9 @@
 
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -35,9 +36,10 @@
  * role-hint"default"
  */
 public class DefaultBuildExecutorManager
-    extends AbstractLogEnabled
     implements BuildExecutorManager, Initializable
 {
+    private Logger log = LoggerFactory.getLogger( DefaultBuildExecutorManager.class );
+
     /**
      * @plexus.requirement role="org.apache.maven.continuum.execution.ContinuumBuildExecutor"
      */
@@ -56,15 +58,15 @@
 
         if ( executors.size() == 0 )
         {
-            getLogger().warn( "No build executors defined." );
+            log.warn( "No build executors defined." );
         }
         else
         {
-            getLogger().info( "Build executors:" );
+            log.info( "Build executors:" );
 
             for ( Iterator it = executors.keySet().iterator(); it.hasNext(); )
             {
-                getLogger().info( "  " + it.next().toString() );
+                log.info( "  " + it.next().toString() );
             }
         }
     }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Tue Dec 30 01:32:54 2008
@@ -25,11 +25,12 @@
 import org.apache.maven.continuum.model.project.ProjectNotifier;
 import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -46,9 +47,10 @@
  * role-hint="default"
  */
 public class DefaultMavenOneMetadataHelper
-    extends AbstractLogEnabled
     implements MavenOneMetadataHelper
 {
+    private Logger log = LoggerFactory.getLogger( DefaultMavenOneMetadataHelper.class );
+
     // ----------------------------------------------------------------------
     // MavenOneMetadataHelper Implementation
     // ----------------------------------------------------------------------
@@ -75,7 +77,7 @@
         {
             result.addError( ContinuumProjectBuildingResult.ERROR_XML_PARSE );
 
-            getLogger().info( "Error while reading maven POM (" + e.getMessage() + ").", e );
+            log.info( "Error while reading maven POM (" + e.getMessage() + ").", e );
 
             return;
         }
@@ -83,7 +85,7 @@
         {
             result.addError( ContinuumProjectBuildingResult.ERROR_POM_NOT_FOUND );
 
-            getLogger().info( "Error while reading maven POM (" + e.getMessage() + ").", e );
+            log.info( "Error while reading maven POM (" + e.getMessage() + ").", e );
 
             return;
         }
@@ -91,7 +93,7 @@
         {
             result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
 
-            getLogger().info( "Error while reading maven POM (" + e.getMessage() + ").", e );
+            log.info( "Error while reading maven POM (" + e.getMessage() + ").", e );
 
             return;
         }
@@ -108,7 +110,7 @@
         {
             result.addError( ContinuumProjectBuildingResult.ERROR_EXTEND );
 
-            getLogger().info( "Cannot use a POM with an 'extend' element." );
+            log.info( "Cannot use a POM with an 'extend' element." );
 
             return;
         }
@@ -137,7 +139,7 @@
             {
                 result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_GROUPID );
 
-                getLogger().info( "Missing 'groupId' element in the POM." );
+                log.info( "Missing 'groupId' element in the POM." );
 
                 // Do not throw an exception or return here, gather up as many results as possible first.
             }
@@ -148,7 +150,7 @@
             {
                 result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_ARTIFACTID );
 
-                getLogger().info( "Missing 'artifactId' element in the POM." );
+                log.info( "Missing 'artifactId' element in the POM." );
 
                 // Do not throw an exception or return here, gather up as many results as possible first.
             }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Tue Dec 30 01:32:54 2008
@@ -59,13 +59,14 @@
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.context.Context;
 import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -81,9 +82,10 @@
  * @plexus.component role="org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper" role-hint="default"
  */
 public class DefaultMavenBuilderHelper
-    extends AbstractLogEnabled
     implements MavenBuilderHelper, Contextualizable, Initializable
 {
+    private Logger log = LoggerFactory.getLogger( DefaultMavenBuilderHelper.class );
+
     /**
      * @plexus.requirement
      */
@@ -373,7 +375,7 @@
 
             Settings settings = getSettings();
 
-            if ( getLogger().isDebugEnabled() )
+            if ( log.isDebugEnabled() )
             {
                 writeSettings( settings );
             }
@@ -382,7 +384,7 @@
 
             project = projectBuilder.build( file, getLocalRepository(), profileManager, false );
 
-            if ( getLogger().isDebugEnabled() )
+            if ( log.isDebugEnabled() )
             {
                 writePom( project );
                 writeActiveProfileStatement( project );
@@ -434,7 +436,7 @@
 
             file.delete();
 
-            getLogger().error( msg );
+            log.error( msg );
 
             return null;
         }
@@ -447,7 +449,7 @@
 
             file.delete();
 
-            getLogger().error( msg );
+            log.error( msg );
 
             return null;
         }
@@ -463,7 +465,7 @@
         {
             result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_SCM, getProjectName( project ) );
 
-            getLogger().error( "Missing 'scm' element in the " + getProjectName( project ) + " POM." );
+            log.error( "Missing 'scm' element in the " + getProjectName( project ) + " POM." );
 
             return null;
         }
@@ -474,7 +476,7 @@
         {
             result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_SCM_CONNECTION, getProjectName( project ) );
 
-            getLogger().error(
+            log.error(
                 "Missing 'connection' element in the 'scm' element in the " + getProjectName( project ) + " POM." );
 
             return null;
@@ -629,11 +631,11 @@
             message.append( "\n************************************************************************************" );
             message.append( "\n\n" );
 
-            getLogger().debug( message.toString() );
+            log.debug( message.toString() );
         }
         catch ( IOException e )
         {
-            getLogger().warn( "Cannot serialize Settings to XML.", e );
+            log.warn( "Cannot serialize Settings to XML.", e );
         }
     }
 
@@ -659,11 +661,11 @@
             message.append( "\n************************************************************************************" );
             message.append( "\n\n" );
 
-            getLogger().debug( message.toString() );
+            log.debug( message.toString() );
         }
         catch ( IOException e )
         {
-            getLogger().warn( "Cannot serialize POM to XML.", e );
+            log.warn( "Cannot serialize POM to XML.", e );
         }
     }
 
@@ -699,7 +701,7 @@
         message.append( "\n************************************************************************************" );
         message.append( "\n\n" );
 
-        getLogger().debug( message.toString() );
+        log.debug( message.toString() );
     }
 
     /**

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Tue Dec 30 01:32:54 2008
@@ -53,8 +53,6 @@
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -64,7 +62,6 @@
     extends AbstractBuildExecutor
     implements ContinuumBuildExecutor
 {
-    
     // ----------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------
@@ -351,7 +348,7 @@
         }
         catch ( ConfigurationException e )
         {
-            getLogger().info( "error on surefire backup directory creation skip backup " + e.getMessage(), e );
+            log.info( "error on surefire backup directory creation skip backup " + e.getMessage(), e );
         }
         backupTestFiles( getWorkingDirectory( project ), backupDirectory );
     }
@@ -367,7 +364,7 @@
         String[] testResultFiles = scanner.getIncludedFiles();
         if ( testResultFiles.length > 0 )
         {
-            getLogger().info( "Backup surefire files." );
+            log.info( "Backup surefire files." );
         }
         for ( String testResultFile : testResultFiles )
         {
@@ -381,7 +378,7 @@
             }
             catch ( IOException e )
             {
-                getLogger().info( "failed to backup unit report file " + xmlFile.getPath() );
+                log.info( "failed to backup unit report file " + xmlFile.getPath() );
             }
         }
     }
@@ -404,9 +401,9 @@
             }
         if ( isRecursive && changes != null && !changes.isEmpty() )
         {
-            if ( logger.isInfoEnabled() )
+            if ( log.isInfoEnabled() )
             {
-                logger.info( "recursive build and changes found --> building" );
+                log.info( "recursive build and changes found --> building" );
             }
             return true;
         }
@@ -416,15 +413,15 @@
         //CONTINUUM-1815: additional check for projects recently released
         if ( !continuumProject.getVersion().equals( project.getVersion() ) )
         {
-            logger.info( "Found changes in project's version ( maybe project was recently released ), building" );
+            log.info( "Found changes in project's version ( maybe project was recently released ), building" );
             return true;
         }
         
         if ( changes.isEmpty() )
         {
-            if ( logger.isInfoEnabled() )
+            if ( log.isInfoEnabled() )
             {
-                logger.info( "Found no changes, not building" );
+                log.info( "Found no changes, not building" );
             }
             return false;
         }
@@ -442,27 +439,27 @@
         while ( i <= files.size() - 1 )
         {
             ChangeFile file = files.get( i );
-            if ( logger.isDebugEnabled() )
+            if ( log.isDebugEnabled() )
             {
-                logger.debug( "changeFile.name " + file.getName() );
-                logger.debug( "check in modules " + modules );
+                log.debug( "changeFile.name " + file.getName() );
+                log.debug( "check in modules " + modules );
             }
             boolean found = false;
             for ( String module : modules )
             {
                 if ( file.getName().indexOf( module ) >= 0 )
                 {
-                    if ( logger.isDebugEnabled() )
+                    if ( log.isDebugEnabled() )
                     {
-                        logger.debug( "changeFile.name " + file.getName() + " removed because in a module" );
+                        log.debug( "changeFile.name " + file.getName() + " removed because in a module" );
                     }                    
                     files.remove( file );
                     found = true;
                     break;
                 }
-                if (logger.isDebugEnabled())
+                if (log.isDebugEnabled())
                 {
-                    logger.debug( "no remving file " + file.getName() + " not in module " + module );
+                    log.debug( "no remving file " + file.getName() + " not in module " + module );
                 }
             }
             if ( !found )
@@ -475,12 +472,12 @@
 
         if ( !shouldBuild )
         {
-            logger.info( "Changes are only in sub-modules." );
+            log.info( "Changes are only in sub-modules." );
         }
 
-        if ( logger.isDebugEnabled() )
+        if ( log.isDebugEnabled() )
         {
-            logger.debug( "shoulbuild = " + shouldBuild );
+            log.debug( "shoulbuild = " + shouldBuild );
         }
         return shouldBuild;
     }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Tue Dec 30 01:32:54 2008
@@ -34,9 +34,10 @@
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.apache.maven.settings.MavenSettingsBuilder;
 import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.jpox.SchemaTool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
@@ -48,9 +49,10 @@
  * role-hint="default"
  */
 public class DefaultContinuumInitializer
-    extends AbstractLogEnabled
     implements ContinuumInitializer
 {
+    private Logger log = LoggerFactory.getLogger( DefaultContinuumInitializer.class );
+
     // ----------------------------------------------------------------------
     //  Requirements
     // ----------------------------------------------------------------------
@@ -92,11 +94,11 @@
     public void initialize()
         throws ContinuumInitializationException
     {
-        getLogger().info( "Continuum initializer running ..." );
+        log.info( "Continuum initializer running ..." );
 
-        if ( getLogger().isDebugEnabled() )
+        if ( log.isDebugEnabled() )
         {
-            getLogger().debug( "Dumping JPOX/JDO Schema Details ..." );
+            log.debug( "Dumping JPOX/JDO Schema Details ..." );
             try
             {
                 SchemaTool.outputDBInfo( null, true );
@@ -104,7 +106,7 @@
             }
             catch ( Exception e )
             {
-                getLogger().debug( "Error while dumping the database schema", e );
+                log.debug( "Error while dumping the database schema", e );
             }
         }
 
@@ -132,7 +134,7 @@
         {
             throw new ContinuumInitializationException( "Can't get default build definition", e );
         }
-        getLogger().info( "Continuum initializer end running ..." );
+        log.info( "Continuum initializer end running ..." );
     }
 
 
@@ -143,12 +145,12 @@
         try
         {
             group = projectGroupDao.getProjectGroupByGroupId( Continuum.DEFAULT_PROJECT_GROUP_GROUP_ID );
-            getLogger().info( "Default Project Group exists" );
+            log.info( "Default Project Group exists" );
         }
         catch ( ContinuumObjectNotFoundException e )
         {
 
-            getLogger().info( "create Default Project Group" );
+            log.info( "create Default Project Group" );
 
             group = new ProjectGroup();
 
@@ -180,7 +182,7 @@
 
         if ( repository == null )
         {
-            getLogger().info( "create Default Local Repository" );
+            log.info( "create Default Local Repository" );
 
             repository = new LocalRepository();
 
@@ -194,7 +196,7 @@
         }
         else if ( !repository.getLocation().equals( settings.getLocalRepository() ) )
         {
-            getLogger().info( "updating location of Default Local Repository" );
+            log.info( "updating location of Default Local Repository" );
 
             repository.setLocation( settings.getLocalRepository() );
 

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=730078&r1=730077&r2=730078&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 Tue Dec 30 01:32:54 2008
@@ -41,12 +41,13 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.util.EntityUtils;
-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.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -67,14 +68,13 @@
  * @version $Id$
  */
 public abstract class AbstractContinuumProjectBuilder
-    extends AbstractLogEnabled
     implements ContinuumProjectBuilder, Initializable
 {
-
     private static final String TMP_DIR = System.getProperty( "java.io.tmpdir" );
 
-    private DefaultHttpClient httpClient;
+    protected Logger log = LoggerFactory.getLogger( AbstractContinuumProjectBuilder.class );
 
+    private DefaultHttpClient httpClient;
 
     public void initialize()
         throws InitializationException
@@ -94,8 +94,6 @@
         ClientConnectionManager cm = new ThreadSafeClientConnManager( params, schemeRegistry );
 
         httpClient = new DefaultHttpClient( cm, params );
-
-
     }
 
     protected File createMetadataFile( URL metadata, String username, String password,
@@ -107,7 +105,7 @@
         {
             url = hidePasswordInUrl( url );
         }
-        getLogger().info( "Downloading " + url );
+        log.info( "Downloading " + url );
 
         InputStream is = null;
 
@@ -134,11 +132,11 @@
                 case 200:
                     break;
                 case 401:
-                    getLogger().error( "Error adding project: Unauthorized " + metadata, null );
+                    log.error( "Error adding project: Unauthorized " + metadata );
                     result.addError( ContinuumProjectBuildingResult.ERROR_UNAUTHORIZED );
                     return null;
                 default:
-                    getLogger().warn( "skip non handled http return code " + res );
+                    log.warn( "skip non handled http return code " + res );
             }
             is = IOUtils.toInputStream( EntityUtils.toString( httpResponse.getEntity(), EntityUtils
                 .getContentCharSet( httpResponse.getEntity() ) ) );
@@ -243,32 +241,32 @@
         }
         catch ( FileNotFoundException e )
         {
-            getLogger().info( "URL not found: " + metadata, e );
+            log.info( "URL not found: " + metadata, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_POM_NOT_FOUND );
         }
         catch ( MalformedURLException e )
         {
-            getLogger().info( "Malformed URL: " + metadata, e );
+            log.info( "Malformed URL: " + metadata, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
         }
         catch ( URISyntaxException e )
         {
-            getLogger().info( "Malformed URL: " + metadata, e );
+            log.info( "Malformed URL: " + metadata, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
         }
         catch ( UnknownHostException e )
         {
-            getLogger().info( "Unknown host: " + metadata, e );
+            log.info( "Unknown host: " + metadata, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN_HOST );
         }
         catch ( IOException e )
         {
-            getLogger().warn( "Could not download the URL: " + metadata, e );
+            log.warn( "Could not download the URL: " + metadata, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
         }
         catch ( HttpException e )
         {
-            getLogger().warn( "Could not download the URL: " + metadata, e );
+            log.warn( "Could not download the URL: " + metadata, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
         }
         return null;

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java Tue Dec 30 01:32:54 2008
@@ -20,7 +20,6 @@
  */
 
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.util.Map;
 
@@ -31,7 +30,6 @@
  * role-hint="default"
  */
 public class DefaultContinuumProjectBuilderManager
-    extends AbstractLogEnabled
     implements ContinuumProjectBuilderManager
 {
     /**

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Tue Dec 30 01:32:54 2008
@@ -121,7 +121,7 @@
         }
         catch ( MavenOneMetadataHelperException e )
         {
-            getLogger().error( "Unknown error while processing metadata", e );
+            log.error( "Unknown error while processing metadata", e );
 
             result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
         }

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Tue Dec 30 01:32:54 2008
@@ -168,37 +168,37 @@
         }
         catch ( MalformedURLException e )
         {
-            getLogger().debug( "Error adding project: Malformed URL " + url, e );
+            log.debug( "Error adding project: Malformed URL " + url, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
             return;
         }
         catch ( URISyntaxException e )
         {
-            getLogger().debug( "Error adding project: Malformed URL " + url, e );
+            log.debug( "Error adding project: Malformed URL " + url, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
             return;
         }        
         catch ( FileNotFoundException e )
         {
-            getLogger().debug( "Error adding project: File not found " + url, e );
+            log.debug( "Error adding project: File not found " + url, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_POM_NOT_FOUND );
             return;
         }
         catch ( ConnectException e )
         {
-            getLogger().debug( "Error adding project: Unable to connect " + url, e );
+            log.debug( "Error adding project: Unable to connect " + url, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_CONNECT );
             return;
         }
         catch ( IOException e )
         {
-            getLogger().info( "Error adding project: Unknown error downloading from " + url, e );
+            log.info( "Error adding project: Unknown error downloading from " + url, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
             return;
         }
         catch ( HttpException e )
         {
-            getLogger().info( "Error adding project: Unknown error downloading from " + url, e );
+            log.info( "Error adding project: Unknown error downloading from " + url, e );
             result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
             return;
         }        
@@ -209,14 +209,14 @@
                 pomFile.delete();
             }
         }
-        getLogger().debug( "groupPom " + groupPom );
+        log.debug( "groupPom " + groupPom );
         if ( groupPom )
         {
             ProjectGroup projectGroup = buildProjectGroup( mavenProject, result );
 
             // project groups have the top lvl build definition which is the default build defintion for the sub
             // projects
-            getLogger().debug( "projectGroup != null" + ( projectGroup != null ) );
+            log.debug( "projectGroup != null" + ( projectGroup != null ) );
             if ( projectGroup != null )
             {
                 List<BuildDefinition> buildDefinitions =
@@ -248,7 +248,7 @@
                         }
                         catch ( ContinuumStoreException e )
                         {
-                            getLogger().warn( "Can't get default schedule.", e );
+                            log.warn( "Can't get default schedule.", e );
                         }
                     }
                     // jdo complains that Collections.singletonList(bd) is a second class object and fails.
@@ -285,7 +285,7 @@
 
             if ( result.hasErrors() )
             {
-                getLogger().info(
+                log.info(
                     "Error adding project: Unknown error mapping project " + url + ": " + result.getErrorsAsString() );
                 return;
             }
@@ -346,7 +346,7 @@
                     }
                     catch ( MalformedURLException e )
                     {
-                        getLogger().debug( "Error adding project module: Malformed URL " + urlString, e );
+                        log.debug( "Error adding project module: Malformed URL " + urlString, e );
                         result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL, urlString );
                         continue;
                     }
@@ -381,7 +381,7 @@
                 if ( StringUtils.isEmpty( buildDefinition.getArguments() ) )
                 {
                     // strange for a mvn build 
-                    getLogger().info( "build definition has empty args" );
+                    log.info( "build definition has empty args" );
                 }
                 else
                 {
@@ -445,7 +445,7 @@
         }
         catch ( ContinuumStoreException e )
         {
-            getLogger().warn( "Can't get default repository.", e );
+            log.warn( "Can't get default repository.", e );
         }
 
         return projectGroup;

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?rev=730078&r1=730077&r2=730078&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java Tue Dec 30 01:32:54 2008
@@ -24,10 +24,11 @@
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.store.ContinuumStoreException;
 import org.codehaus.plexus.action.ActionManager;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
 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;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -39,9 +40,10 @@
  * role-hint="check-out-project"
  */
 public class CheckOutTaskExecutor
-    extends AbstractLogEnabled
     implements TaskExecutor
 {
+    private Logger log = LoggerFactory.getLogger( CheckOutTaskExecutor.class );
+
     /**
      * @plexus.requirement
      */
@@ -71,7 +73,7 @@
         }
         catch ( ContinuumStoreException ex )
         {
-            getLogger().error( "Internal error while getting the project.", ex );
+            log.error( "Internal error while getting the project.", ex );
 
             return;
         }



Mime
View raw message