svn commit: r1381930 - in /archiva/redback/redback-components/trunk: spring-apacheds/src/main/java/org/apache/archiva/redback/components/apacheds/ spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ spring-taskqueu...

[olamy]

Author: olamy
Date: Fri Sep  7 08:17:00 2012
New Revision: 1381930

URL: http://svn.apache.org/viewvc?rev=1381930&view=rev
Log:
improve a bit logging pattern with .info

Modified:
    
archiva/redback/redback-components/trunk/spring-apacheds/src/main/java/org/apache/archiva/redback/components/apacheds/DefaultApacheDs.java
    
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
    
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java

Modified: 
archiva/redback/redback-components/trunk/spring-apacheds/src/main/java/org/apache/archiva/redback/components/apacheds/DefaultApacheDs.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-apacheds/src/main/java/org/apache/archiva/redback/components/apacheds/DefaultApacheDs.java?rev=1381930&r1=1381929&r2=1381930&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-apacheds/src/main/java/org/apache/archiva/redback/components/apacheds/DefaultApacheDs.java
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-apacheds/src/main/java/org/apache/archiva/redback/components/apacheds/DefaultApacheDs.java
 Fri Sep  7 08:17:00 2012
@@ -195,7 +195,7 @@ public class DefaultApacheDs
     {
         logger.info( "Starting Apache Directory Server server." );
 
-        logger.info( "ApacheDS basedir: " + basedir.getAbsolutePath() );
+        logger.info( "ApacheDS basedir: {}", basedir.getAbsolutePath() );
 
         File logs = new File( basedir, "logs" );
 

Modified: 
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java?rev=1381930&r1=1381929&r2=1381930&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-taskqueue/src/main/java/org/apache/archiva/redback/components/taskqueue/execution/ThreadedTaskQueueExecutor.java
 Fri Sep  7 08:17:00 2012
@@ -19,9 +19,9 @@ package org.apache.archiva.redback.compo
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.redback.components.taskqueue.Task;
 import org.apache.archiva.redback.components.taskqueue.TaskQueue;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,7 +38,6 @@ import java.util.concurrent.TimeoutExcep
 /**
  * @author <a href="mailto:tryg...@inamo.no";>Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:ken...@codehaus.org";>Kenney Westerhof</a>
- *
  */
 public class ThreadedTaskQueueExecutor
     implements TaskQueueExecutor
@@ -307,11 +306,11 @@ public class ThreadedTaskQueueExecutor
         {
             if ( System.currentTimeMillis() > endTime )
             {
-                logger.warn( "Timeout waiting for executor thread '" + name + 
"' to stop, aborting" );
+                logger.warn( "Timeout waiting for executor thread '{}' to 
stop, aborting", name );
                 break;
             }
 
-            logger.info( "Waiting until task executor '" + name + "' is 
idling..." );
+            logger.info( "Waiting until task executor '{}' is idling...", name 
);
 
             try
             {

Modified: 
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
URL: 
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java?rev=1381930&r1=1381929&r2=1381930&view=diff
==============================================================================
--- 
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
 (original)
+++ 
archiva/redback/redback-components/trunk/spring-taskqueue/src/test/java/org/apache/archiva/redback/components/taskqueue/execution/BuildProjectTaskExecutor.java
 Fri Sep  7 08:17:00 2012
@@ -18,6 +18,7 @@ package org.apache.archiva.redback.compo
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import org.apache.archiva.redback.components.taskqueue.BuildProjectTask;
 import org.apache.archiva.redback.components.taskqueue.Task;
 import org.slf4j.Logger;
@@ -25,11 +26,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 /**
- *
  * @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a>
- *
  */
-@Service("taskExecutor#build-project")
+@Service ( "taskExecutor#build-project" )
 public class BuildProjectTaskExecutor
     implements TaskExecutor
 {
@@ -43,7 +42,7 @@ public class BuildProjectTaskExecutor
 
         task.start();
 
-        logger.info( "Task: " + task + " cancelled: " + task.isCancelled() + 
"; done: " + task.isDone() );
+        logger.info( "Task:{} cancelled: {}; done: {}", task, 
task.isCancelled(), task.isDone() );
 
         long time = System.currentTimeMillis();
 
@@ -53,13 +52,13 @@ public class BuildProjectTaskExecutor
         {
             try
             {
-                logger.info( "Sleeping " + timeToSleep + "ms (interrupts 
ignored: " + task.ignoreInterrupts() + ")" );
+                logger.info( "Sleeping {} ms (interrupts ignored: {} )", 
timeToSleep, task.ignoreInterrupts() );
                 Thread.sleep( timeToSleep );
 
                 task.done();
 
-                logger.info( "Task completed normally: " + task + " cancelled: 
" + task.isCancelled() + "; done: "
-                                 + task.isDone() );
+                logger.info( "Task completed normally: {} cancelled: {}; done: 
{}", task, task.isCancelled(),
+                             task.isDone() );
             }
             catch ( InterruptedException e )
             {
@@ -67,8 +66,8 @@ public class BuildProjectTaskExecutor
                 {
                     task.cancel();
 
-                    logger.info(
-                        "Task cancelled: " + task + " cancelled: " + 
task.isCancelled() + "; done: " + task.isDone() );
+                    logger.info( "Task cancelled: {} cancelled: {} ; done: 
{}", task, task.isCancelled(),
+                                 task.isDone() );
 
                     throw new TaskExecutionException( "Never interrupt 
sleeping threads! :)", e );
                 }