servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1148530 [3/6] - in /servicemix/smx3/trunk: ./ common/servicemix-components/ common/servicemix-components/src/main/java/org/apache/servicemix/components/activesoap/ common/servicemix-components/src/main/java/org/apache/servicemix/components...
Date Tue, 19 Jul 2011 21:04:03 GMT
Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajMarshaler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajMarshaler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/saaj/SaajMarshaler.java Tue Jul 19 21:03:14 2011
@@ -37,31 +37,31 @@ import javax.xml.soap.SOAPPart;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.dom.DOMSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.xml.sax.SAXException;
 
 /**
- * @version $Revision: 431309 $
+ * @version $Revision$
  */
 public class SaajMarshaler {
 
-    private static final transient Log log = LogFactory.getLog(SaajMarshaler.class);
+    private static final transient Logger logger = LoggerFactory.getLogger(SaajMarshaler.class);
 
     protected SourceTransformer transformer = new SourceTransformer();
     private MessageFactory messageFactory;
 
     public void toNMS(NormalizedMessage normalizedMessage, SOAPMessage soapMessage) throws MessagingException, SOAPException {
 
-        if (log.isDebugEnabled()) {
+        if (logger.isDebugEnabled()) {
         	try {
 	            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 	            soapMessage.writeTo(buffer);
-	            log.debug(new String(buffer.toByteArray()));
+	            logger.debug(new String(buffer.toByteArray()));
         	} catch (Exception e) { }
         }
         
@@ -105,9 +105,9 @@ public class SaajMarshaler {
         	}
 		}
         
-        if (log.isDebugEnabled()) {
+        if (logger.isDebugEnabled()) {
         	try {
-        		log.debug(transformer.toString(elem));
+        		logger.debug(transformer.toString(elem));
         	} catch (Exception e) { }
         }
         
@@ -217,4 +217,5 @@ public class SaajMarshaler {
     protected MessageFactory createMessageFactory() throws SOAPException {
         return MessageFactory.newInstance();
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptComponent.java Tue Jul 19 21:03:14 2011
@@ -43,7 +43,7 @@ import org.springframework.core.io.Resou
  * A component which is capable of invoking a compiledScript using
  * <a href="http://servicemix.org/JSR+223">JSR 223</a> to allow any scripting language to be integrated.
  *
- * @version $Revision: 556864 $
+ * @version $Revision$
  */
 public class ScriptComponent extends TransformComponentSupport {
 
@@ -178,7 +178,7 @@ public class ScriptComponent extends Tra
     }
 
     /**
-     * Sets the resource bundle to use when creating a logger, if one is not
+     * Sets the resource bundle to use when creating a LOGGER, if one is not
      * explicitly configured.
      *
      * @param logResourceBundle
@@ -195,7 +195,7 @@ public class ScriptComponent extends Tra
     }
 
     /**
-     * Sets the logger to use if the script decides to log
+     * Sets the LOGGER to use if the script decides to LOGGER
      *
      * @param scriptLogger
      */
@@ -296,4 +296,5 @@ public class ScriptComponent extends Tra
             throw new JBIException("If no 'compiledScript' is specified you must specify the 'scriptText' or 'script'");
         }
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptExpression.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptExpression.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptExpression.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/script/ScriptExpression.java Tue Jul 19 21:03:14 2011
@@ -30,9 +30,10 @@ import javax.script.ScriptException;
  * <a href="http://servicemix.org/JSR+223">JSR 223</a> to allow any scripting language to be used as an expression
  * language.
  *
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class ScriptExpression implements Expression {
+
     private CompiledScript compiledScript;
 
     public Object evaluate(MessageExchange exchange, NormalizedMessage message) throws MessagingException {
@@ -45,4 +46,5 @@ public class ScriptExpression implements
             throw new MessagingException(e);
         }
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/splitter/SplitterComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/splitter/SplitterComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/splitter/SplitterComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/splitter/SplitterComponent.java Tue Jul 19 21:03:14 2011
@@ -42,8 +42,7 @@ import org.xml.sax.SAXException;
 
 /**
  * This Component splits a message according to a XPath expression.
- * 
- * @author george
+ *
  * @deprecated use the XPathSplitter pattern from the EIP component instead
  */
 public class SplitterComponent extends TransformComponentSupport {
@@ -116,4 +115,5 @@ public class SplitterComponent extends T
 		this.nodePath = nodePath;
 		this.expression = null;
 	}
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/CountingErrorHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/CountingErrorHandler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/CountingErrorHandler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/CountingErrorHandler.java Tue Jul 19 21:03:14 2011
@@ -25,9 +25,10 @@ import org.xml.sax.SAXException;
 /**
  * A simple implementation of {@link ErrorHandler} which just counts the number of warnings, errors and fatal errors.
  *
- * @version $Revision: 430194 $
+ * @version $Revision$
  */
 public class CountingErrorHandler implements MessageAwareErrorHandler {
+
     private int warningCount;
     private int errorCount;
     private int fatalErrorCount;

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/CountingErrorHandlerFactory.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/CountingErrorHandlerFactory.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/CountingErrorHandlerFactory.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/CountingErrorHandlerFactory.java Tue Jul 19 21:03:14 2011
@@ -16,12 +16,7 @@
  */
 package org.apache.servicemix.components.validation;
 
-/**
- * @author gmcdonald
- *
- */
-public class CountingErrorHandlerFactory implements
-        MessageAwareErrorHandlerFactory {
+public class CountingErrorHandlerFactory implements MessageAwareErrorHandlerFactory {
 
     /* (non-Javadoc)
      * @see org.apache.servicemix.components.validation.MessageAwareErrorHandlerFactory#createMessageAwareErrorHandler()

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAggregatingErrorHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAggregatingErrorHandler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAggregatingErrorHandler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAggregatingErrorHandler.java Tue Jul 19 21:03:14 2011
@@ -35,7 +35,7 @@ import org.xml.sax.SAXException;
  * An implementation of {@link ErrorHandler} which aggregates all warnings and
  * error messages into a StringBuffer.
  *
- * @version $Revision: 359186 $
+ * @version $Revision$
  */
 public class MessageAggregatingErrorHandler implements MessageAwareErrorHandler {
     
@@ -87,17 +87,7 @@ public class MessageAggregatingErrorHand
     private StringBuffer messages = new StringBuffer();
     
     private SourceTransformer sourceTransformer = new SourceTransformer();
-    
-    /**
-     * Constructor.
-     * 
-     * @param rootElement
-     *      The root element name of the fault xml message 
-     * @param namespace
-     *      The namespace for the fault xml message
-     * @param includeStackTraces
-     *      Include stracktraces in the final output
-     */
+
     public MessageAggregatingErrorHandler(String rootPath, String namespace, boolean includeStackTraces) throws IllegalArgumentException {
         if (rootPath == null || rootPath.trim().length() == 0) {
             throw new IllegalArgumentException("rootPath must not be null or an empty string");

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAggregatingErrorHandlerFactory.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAggregatingErrorHandlerFactory.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAggregatingErrorHandlerFactory.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAggregatingErrorHandlerFactory.java Tue Jul 19 21:03:14 2011
@@ -16,12 +16,7 @@
  */
 package org.apache.servicemix.components.validation;
 
-/**
- * @author gmcdonald
- *
- */
-public class MessageAggregatingErrorHandlerFactory implements
-        MessageAwareErrorHandlerFactory {
+public class MessageAggregatingErrorHandlerFactory implements MessageAwareErrorHandlerFactory {
 
     /**
      * The root element name for the fault xml message

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAwareErrorHandler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAwareErrorHandler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAwareErrorHandler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAwareErrorHandler.java Tue Jul 19 21:03:14 2011
@@ -63,14 +63,7 @@ public interface MessageAwareErrorHandle
 	 * @return
 	 */
 	public Object getMessagesAs(Class format) throws MessagingException;
-	
-	/**
-	 * Does the message support a given format?
-	 * 
-	 * @param clazz
-	 * 		The Class of the format for which support is required.
-	 * @return
-	 */
+
 	public boolean supportsMessageFormat(Class format);
 	
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAwareErrorHandlerFactory.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAwareErrorHandlerFactory.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAwareErrorHandlerFactory.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/MessageAwareErrorHandlerFactory.java Tue Jul 19 21:03:14 2011
@@ -18,9 +18,6 @@ package org.apache.servicemix.components
 
 /**
  * Simple factory interface to a MessageAwareErrorHandler implementation
- * 
- * @author gmcdonald
- *
  */
 public interface MessageAwareErrorHandlerFactory {
     
@@ -30,4 +27,5 @@ public interface MessageAwareErrorHandle
      * @return
      */
     public MessageAwareErrorHandler createMessageAwareErrorHandler();
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/ValidateComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/ValidateComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/ValidateComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/validation/ValidateComponent.java Tue Jul 19 21:03:14 2011
@@ -45,9 +45,10 @@ import java.io.IOException;
  * and returning a fault if the document does not conform to the schema
  * otherwise the message is passed on its way.
  *
- * @version $Revision: 631926 $
+ * @version $Revision$
  */
 public class ValidateComponent extends TransformComponentSupport {
+
     private Schema schema;
     private String schemaLanguage = "http://www.w3.org/2001/XMLSchema";
     private Source schemaSource;
@@ -231,5 +232,6 @@ public class ValidateComponent extends T
 	public void setHandlingErrorMethod(String handlingErrorMethod) {
 		this.handlingErrorMethod = handlingErrorMethod;
 	}
+
 }
 

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FileObjectEditor.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FileObjectEditor.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FileObjectEditor.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FileObjectEditor.java Tue Jul 19 21:03:14 2011
@@ -26,9 +26,10 @@ import javax.jbi.JBIException;
 /**
  * A bean editor to make it easier to create new file system objects using VFS
  *
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class FileObjectEditor {
+
     private String path;
     private FileSystemManager fileSystemManager;
 
@@ -72,4 +73,5 @@ public class FileObjectEditor {
             throw new JBIException("Failed to initialize file system manager: " + e, e);
         }
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FilePoller.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FilePoller.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FilePoller.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FilePoller.java Tue Jul 19 21:03:14 2011
@@ -16,8 +16,6 @@
  */
 package org.apache.servicemix.components.vfs;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.commons.vfs.FileContent;
 import org.apache.commons.vfs.FileObject;
 import org.apache.commons.vfs.FileSelector;
@@ -25,6 +23,8 @@ import org.apache.commons.vfs.FileSystem
 import org.apache.servicemix.components.util.DefaultFileMarshaler;
 import org.apache.servicemix.components.util.FileMarshaler;
 import org.apache.servicemix.components.util.PollingComponentSupport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -41,10 +41,11 @@ import java.util.Set;
  * <a href="http://jakarta.apache.org/commons/vfs.html">Jakarta Commons VFS</a> library
  * for handling various file systems like files, Samba, WebDAV, FTP, SFTP and temporary files.
  *
- * @version $Revision: 666120 $
+ * @version $Revision$
  */
 public class FilePoller extends PollingComponentSupport {
-    private static final Log log = LogFactory.getLog(FilePoller.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(FilePoller.class);
 
     private FileMarshaler marshaler = new DefaultFileMarshaler();
     private FileObjectEditor editor = new FileObjectEditor();
@@ -68,7 +69,6 @@ public class FilePoller extends PollingC
         }
     }
 
-
     // Properties
     //-------------------------------------------------------------------------
     public FileObject getDirectory() {
@@ -142,8 +142,8 @@ public class FilePoller extends PollingC
 
     protected void pollFile(final FileObject aFile) {
         if (workingSet.add(aFile)) {
-            if (log.isDebugEnabled()) {
-                log.debug("Scheduling file " + aFile + " for processing");
+            if (logger.isDebugEnabled()) {
+                logger.debug("Scheduling file " + aFile + " for processing");
             }
             getExecutor().execute(new Runnable() {
                 public void run() {
@@ -167,7 +167,7 @@ public class FilePoller extends PollingC
             }
         }
         catch (Exception e) {
-            log.error("Failed to process file: " + file + ". Reason: " + e, e);
+            logger.error("Failed to process file: " + file + ". Reason: " + e, e);
         }
     }
 
@@ -192,4 +192,5 @@ public class FilePoller extends PollingC
             throw exchange.getError();
         }
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FileWriter.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FileWriter.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FileWriter.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/vfs/FileWriter.java Tue Jul 19 21:03:14 2011
@@ -16,14 +16,14 @@
  */
 package org.apache.servicemix.components.vfs;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.commons.vfs.FileContent;
 import org.apache.commons.vfs.FileObject;
 import org.apache.commons.vfs.FileSystemManager;
 import org.apache.servicemix.components.util.DefaultFileMarshaler;
 import org.apache.servicemix.components.util.FileMarshaler;
 import org.apache.servicemix.components.util.OutBinding;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.jbi.JBIException;
 import javax.jbi.messaging.MessageExchange;
@@ -37,10 +37,11 @@ import java.io.OutputStream;
  * <a href="http://jakarta.apache.org/commons/vfs.html">Jakarta Commons VFS</a> library
  * for handling various file systems like files, Samba, WebDAV, FTP, SFTP and temporary files.
  *
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class FileWriter extends OutBinding {
-    private static final Log log = LogFactory.getLog(FileWriter.class);
+
+    private static final Logger logger = LoggerFactory.getLogger(FileWriter.class);
 
     private FileObject directory;
     private FileObjectEditor editor = new FileObjectEditor();
@@ -131,10 +132,11 @@ public class FileWriter extends OutBindi
                     out.close();
                 }
                 catch (IOException e) {
-                    log.error("Caught exception while closing stream on error: " + e, e);
+                    logger.error("Caught exception while closing stream on error", e);
                 }
             }
         }
     }
+
 }
 

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/FailedToCreateDOMException.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/FailedToCreateDOMException.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/FailedToCreateDOMException.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/FailedToCreateDOMException.java Tue Jul 19 21:03:14 2011
@@ -19,10 +19,12 @@ package org.apache.servicemix.components
 /**
  * Thrown if the lazily created DOM node could not be created for the WSIF response.
  *
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class FailedToCreateDOMException extends RuntimeException {
+
     public FailedToCreateDOMException(Throwable cause) {
         super(cause);
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFBinding.java Tue Jul 19 21:03:14 2011
@@ -30,8 +30,6 @@ import javax.wsdl.Binding;
 import javax.wsdl.Definition;
 import javax.wsdl.WSDLException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.components.util.TransformComponentSupport;
 import org.apache.wsif.WSIFException;
 import org.apache.wsif.WSIFMessage;
@@ -39,17 +37,19 @@ import org.apache.wsif.WSIFOperation;
 import org.apache.wsif.WSIFService;
 import org.apache.wsif.WSIFServiceFactory;
 import org.apache.wsif.util.WSIFUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
 
 /**
  * Consumers JBI messages and sends them as a synchronous request/response into WSIF
  * then forwards the response
  *
- * @version $Revision: 556864 $
+ * @version $Revision$
  */
 public class WSIFBinding extends TransformComponentSupport {
 
-    private static transient Log log = LogFactory.getLog(WSIFBinding.class);
+    private static transient Logger logger = LoggerFactory.getLogger(WSIFBinding.class);
 
     private WSIFMarshaler marshaler = new WSIFMarshaler();
     private WSIFService serviceHelper;
@@ -73,9 +73,9 @@ public class WSIFBinding extends Transfo
                 serviceHelper = factory.getService(definition);
             }
 
-            if (log.isDebugEnabled()) {
+            if (logger.isDebugEnabled()) {
                 for (Iterator iter = serviceHelper.getAvailablePortNames(); iter.hasNext();) {
-                    log.debug("Available port name: " + iter.next());
+                    logger.debug("Available port name: " + iter.next());
                 }
             }
 

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFMarshaler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFMarshaler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFMarshaler.java Tue Jul 19 21:03:14 2011
@@ -41,9 +41,10 @@ import java.util.Map;
 /**
  * A class which marshalls a WSIF messages into and out of NMS
  *
- * @version $Revision: 431309 $
+ * @version $Revision$
  */
 public class WSIFMarshaler {
+
     public static final String WSDL_WRAPPER_NAMESPACE = "http://java.sun.com/xml/ns/jbi/wsdl-11-wrapper";
 
     private SourceTransformer transformer = new SourceTransformer();
@@ -200,5 +201,4 @@ public class WSIFMarshaler {
         }
     }
 
-
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOperationInfo.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOperationInfo.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOperationInfo.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOperationInfo.java Tue Jul 19 21:03:14 2011
@@ -23,9 +23,10 @@ import org.apache.wsif.WSIFPort;
 /**
  * The information about an operation.
  *
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class WSIFOperationInfo {
+
     private WSIFPort port;
     private String name;
 
@@ -37,4 +38,5 @@ public class WSIFOperationInfo {
     public WSIFOperation createWsifOperation() throws WSIFException {
         return this.port.createOperation(name);
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOperationMap.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOperationMap.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOperationMap.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOperationMap.java Tue Jul 19 21:03:14 2011
@@ -34,7 +34,7 @@ import org.apache.wsif.WSIFService;
 /**
  * Maintains a Map of the available operations for the binding.
  * 
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class WSIFOperationMap {
 

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/wsif/WSIFOutBinding.java Tue Jul 19 21:03:14 2011
@@ -26,7 +26,7 @@ import org.apache.wsif.WSIFOperation;
 /**
  * Consumers JBI messages and sends them as a oneway into WSIF
  *
- * @version $Revision: 429277 $
+ * @version $Revision$
  */
 public class WSIFOutBinding extends OutBinding {
 
@@ -79,4 +79,5 @@ public class WSIFOutBinding extends OutB
         operation.executeInputOnlyOperation(message);
         done(exchange);
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireBinding.java Tue Jul 19 21:03:14 2011
@@ -32,19 +32,17 @@ import org.codehaus.xfire.transport.Tran
 import org.codehaus.xfire.transport.local.LocalTransport;
 
 public class XFireBinding extends OutBinding {
+
     private XMarshaler marshaler;
 
     private XFire xfire;
 
-    public XFireBinding()
-    {
+    public XFireBinding() {
         super();
-
         this.marshaler = new XMarshaler();
     }
     
     protected void process(MessageExchange messageExchange, NormalizedMessage nm) throws Exception {
-        
         XMLStreamReader reader = marshaler.createStreamReader(nm);
         if (reader == null) {
             throw new JBIException("Could not get source as XMLStreamReader.");
@@ -77,4 +75,5 @@ public class XFireBinding extends OutBin
     public void setXfire(XFire xfire) {
         this.xfire = xfire;
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XFireOutBinding.java Tue Jul 19 21:03:14 2011
@@ -30,14 +30,13 @@ import javax.jbi.messaging.NormalizedMes
 import javax.xml.stream.XMLStreamReader;
 
 public class XFireOutBinding extends OutBinding {
+
     private XMarshaler marshaler;
 
     private XFire xfire;
 
-    public XFireOutBinding()
-    {
+    public XFireOutBinding() {
         super();
-
         this.marshaler = new XMarshaler();
     }
     
@@ -67,4 +66,5 @@ public class XFireOutBinding extends Out
     public void setXfire(XFire xfire) {
         this.xfire = xfire;
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xfire/XMarshaler.java Tue Jul 19 21:03:14 2011
@@ -35,14 +35,13 @@ import org.apache.servicemix.jbi.jaxp.St
 import org.codehaus.xfire.exchange.OutMessage;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class XMarshaler {
 
     private SourceTransformer transformer;
     
-    public XMarshaler()
-    {
+    public XMarshaler() {
         transformer = new SourceTransformer();
     }
 

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xslt/XalanExtension.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xslt/XalanExtension.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xslt/XalanExtension.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xslt/XalanExtension.java Tue Jul 19 21:03:14 2011
@@ -46,14 +46,10 @@ import javax.xml.transform.dom.DOMSource
  * An extension to allow <a href="http://xml.apache.org/xalan/">Xalan</a> to perform XPath based routing using
  * ServiceMix.
  *
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class XalanExtension extends MarshalerSupport {
 
-    // Extension elements
-    //-------------------------------------------------------------------------
-
-
     /**
      * Forwards the inbound message to the destination copying the content and properties
      */
@@ -252,4 +248,5 @@ public class XalanExtension extends Mars
         }
         return answer;
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xslt/XsltComponent.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xslt/XsltComponent.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xslt/XsltComponent.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/main/java/org/apache/servicemix/components/xslt/XsltComponent.java Tue Jul 19 21:03:14 2011
@@ -52,7 +52,7 @@ import org.w3c.dom.Node;
  * href="http://java.sun.com/xml/jaxp/">JAXP</a> to perform the XSLT
  * transformation.
  * 
- * @version $Revision: 464270 $
+ * @version $Revision$
  */
 public class XsltComponent extends TransformComponentSupport implements MessageExchangeListener {
 

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java Tue Jul 19 21:03:14 2011
@@ -20,19 +20,20 @@ import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.api.EndpointResolver;
 import org.apache.servicemix.tck.TestSupport;
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.w3c.dom.Node;
 
 /**
- * @version $Revision: 690396 $
+ * @version $Revision$
  */
 public class CacheTest extends TestSupport {
-    private static transient Log log = LogFactory.getLog(CacheTest.class);
+
+    private static transient Logger logger = LoggerFactory.getLogger(CacheTest.class);
 
     public void testCache() throws Exception {
         EndpointResolver cachedService = client.createResolverForService(new QName("http://servicemix.org/cheese/", "myService"));
@@ -44,7 +45,7 @@ public class CacheTest extends TestSuppo
         }
         String text = transformer.toString((Source) object);
 
-        log.info("Cache: Received response: " + text);
+        logger.info("Cache: Received response: {}", text);
 
         object = client.request(cachedService, null, null, "<foo id='123'/>");
         if (object instanceof Node) {
@@ -52,7 +53,7 @@ public class CacheTest extends TestSuppo
         }
         String text2 = transformer.toString((Source) object);
 
-        log.info("Cache: Received response: " + text2);
+        logger.info("Cache: Received response: {}", text2);
 
         assertEquals("Responses should be equal", text, text2);
 
@@ -64,7 +65,7 @@ public class CacheTest extends TestSuppo
         }
         text = transformer.toString((Source) object);
 
-        log.info("ServiceImpl: Received response: " + text);
+        logger.info("ServiceImpl: Received response: {}", text);
 
         object = client.request(service, null, null, "<foo id='123'/>");
         if (object instanceof Node) {
@@ -72,7 +73,7 @@ public class CacheTest extends TestSuppo
         }
         text2 = transformer.toString((Source) object);
 
-        log.info("ServiceImpl: Received response: " + text2);
+        logger.info("ServiceImpl: Received response: {}", text2);
 
         assertTrue("Responses should be different but were both: " + text, !text.equals(text2));
 
@@ -81,4 +82,5 @@ public class CacheTest extends TestSuppo
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/cache/example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsRouteTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsRouteTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsRouteTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsRouteTest.java Tue Jul 19 21:03:14 2011
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
 /**
- * @version $Revision: 376451 $
+ * @version $Revision$
  */
 public class DroolsRouteTest extends TestSupport {
 

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java Tue Jul 19 21:03:14 2011
@@ -23,7 +23,7 @@ import org.springframework.context.suppo
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class DroolsTest extends TestSupport {
 
@@ -37,4 +37,5 @@ public class DroolsTest extends TestSupp
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/drools/example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java Tue Jul 19 21:03:14 2011
@@ -21,7 +21,7 @@ import javax.xml.namespace.QName;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class DroolsWithJbiRulesForwardTest extends DroolsTest {
 
@@ -35,4 +35,5 @@ public class DroolsWithJbiRulesForwardTe
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new org.apache.xbean.spring.context.ClassPathXmlApplicationContext("org/apache/servicemix/components/drools/jbi-example-forward.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java Tue Jul 19 21:03:14 2011
@@ -20,11 +20,12 @@ import org.springframework.context.suppo
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class DroolsWithJbiRulesTest extends DroolsTest {
 
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/drools/jbi-example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java Tue Jul 19 21:03:14 2011
@@ -26,7 +26,7 @@ import org.springframework.context.suppo
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class EmailTest extends TestSupport {
 
@@ -49,4 +49,5 @@ public class EmailTest extends TestSuppo
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/email/example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java Tue Jul 19 21:03:14 2011
@@ -30,20 +30,20 @@ import javax.mail.internet.MimeMultipart
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
 import org.apache.servicemix.jbi.util.ByteArrayDataSource;
 import org.apache.servicemix.tck.TestSupport;
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
 /**
- * @version $Revision: 556864 $
+ * @version $Revision$
  */
 public class MimeMailTest extends TestSupport {
 
-    private static transient Log log = LogFactory.getLog(MimeMailTest.class);
+    private static transient Logger logger = LoggerFactory.getLogger(MimeMailTest.class);
 
     public void testSendUsingMessageProperties() throws Exception {
 
@@ -67,7 +67,7 @@ public class MimeMailTest extends TestSu
 
         MimeMessage mail = (MimeMessage) messages.get(0);
 
-        log.info("Created message: " + message);
+        logger.info("Created message: {}", message);
 
         assertEquals("subject", "Hello from JUnit!", mail.getSubject());
     }
@@ -96,7 +96,7 @@ public class MimeMailTest extends TestSu
 
         MimeMessage mail = (MimeMessage) messages.get(0);
 
-        log.info("Created message: " + message);
+        logger.info("Created message: {}", message);
 
         assertEquals("subject", "Hello from JUnit!", mail.getSubject());
     }
@@ -123,7 +123,7 @@ public class MimeMailTest extends TestSu
 
         MimeMessage message = (MimeMessage) messages.get(0);
 
-        log.info("Created message: " + message);
+        logger.info("Created message: {}", message);
 
         assertEquals("subject", "Drink a beer James", message.getSubject());
     }
@@ -153,7 +153,7 @@ public class MimeMailTest extends TestSu
 
         MimeMessage message = (MimeMessage) messages.get(0);
 
-        log.info("Created message: " + message);
+        logger.info("Created message: {}", message);
         Object content = message.getContent();
         assertTrue(content instanceof MimeMultipart);
         MimeMultipart contentMP = (MimeMultipart) content;
@@ -179,4 +179,5 @@ public class MimeMailTest extends TestSu
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/email/mimeMail.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java Tue Jul 19 21:03:14 2011
@@ -24,20 +24,20 @@ import javax.jbi.messaging.NormalizedMes
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
 import org.apache.servicemix.tck.TestSupport;
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.mail.SimpleMailMessage;
 
 /**
- * @version $Revision: 556864 $
+ * @version $Revision$
  */
 public class SimpleMailTest extends TestSupport {
 
-    private static final transient Log log = LogFactory.getLog(SimpleMailTest.class);
+    private static final transient Logger logger = LoggerFactory.getLogger(SimpleMailTest.class);
 
     public void testUsingXPathExpressionsInSimpleEmail() throws Exception {
 
@@ -62,7 +62,7 @@ public class SimpleMailTest extends Test
 
         SimpleMailMessage message = (SimpleMailMessage) messages.get(0);
 
-        log.info("Created message: " + message);
+        logger.info("Created message: {}", message);
 
         assertEquals("text", "Hello there James how are you today?", message.getText());
         assertEquals("from", "james@nowhere.com", message.getFrom());
@@ -93,7 +93,7 @@ public class SimpleMailTest extends Test
 
         SimpleMailMessage mailMessage = (SimpleMailMessage) messages.get(0);
 
-        log.info("Created message: " + mailMessage);
+        logger.info("Created message: {}", mailMessage);
 
         assertEquals("subject", "Subject came from expression", mailMessage.getSubject());
         assertEquals("from", "junit@servicemix.org", mailMessage.getFrom());
@@ -102,4 +102,5 @@ public class SimpleMailTest extends Test
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/email/simpleMail.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/email/StubJavaMailSender.java Tue Jul 19 21:03:14 2011
@@ -25,8 +25,8 @@ import javax.mail.internet.MimeMessage;
 
 import junit.framework.Assert;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.mail.MailException;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
@@ -35,11 +35,11 @@ import org.springframework.mail.javamail
 /**
  * A stub {@link JavaMailSender} useful for testing.
  *
- * @version $Revision: 556864 $
+ * @version $Revision$
  */
 public class StubJavaMailSender extends Assert implements JavaMailSender {
 
-    private static transient Log log = LogFactory.getLog(StubJavaMailSender.class);
+    private static transient Logger logger = LoggerFactory.getLogger(StubJavaMailSender.class);
 
     private List messages = new ArrayList();
     private Object semaphore = new Object();
@@ -92,7 +92,6 @@ public class StubJavaMailSender extends 
         }
     }
 
-
     /**
      * @return all the messages on the list so far, clearing the buffer
      */
@@ -125,7 +124,7 @@ public class StubJavaMailSender extends 
 
 
     public void waitForMessagesToArrive(int messageCount) {
-        log.info("Waiting for message to arrive");
+        logger.info("Waiting for message to arrive");
 
         long start = System.currentTimeMillis();
 
@@ -139,15 +138,14 @@ public class StubJavaMailSender extends 
                 }
             }
             catch (InterruptedException e) {
-                log.info("Caught: " + e);
+                logger.info("Caught: ", e);
             }
         }
         long end = System.currentTimeMillis() - start;
 
-        log.info("End of wait for " + end + " millis");
+        logger.info("End of wait for {} millis", end);
     }
 
-
     /**
      * Performs a testing assertion that the correct number of messages have been received
      *
@@ -157,7 +155,7 @@ public class StubJavaMailSender extends 
         waitForMessagesToArrive(messageCount);
 
         assertEquals("expected number of messages", messageCount, getMessageCount());
-        log.info("Received messages:  " + getMessages());
+        logger.info("Received messages: {}", getMessages());
     }
 
     public boolean hasReceivedMessage() {
@@ -167,4 +165,5 @@ public class StubJavaMailSender extends 
     public boolean hasReceivedMessages(int messageCount) {
         return getMessageCount() >= messageCount;
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java Tue Jul 19 21:03:14 2011
@@ -27,7 +27,7 @@ import org.springframework.context.suppo
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
- * @version $Revision: 359213 $
+ * @version $Revision$
  */
 public class BinaryFileTest extends TestSupport {
 
@@ -66,4 +66,5 @@ public class BinaryFileTest extends Test
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/file/binary-example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java Tue Jul 19 21:03:14 2011
@@ -26,7 +26,7 @@ import org.springframework.context.suppo
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class FileTest extends TestSupport {
 
@@ -44,4 +44,5 @@ public class FileTest extends TestSuppor
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/file/example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java Tue Jul 19 21:03:14 2011
@@ -25,20 +25,21 @@ import javax.xml.transform.stream.Stream
 
 import junit.framework.TestCase;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.client.ServiceMixClient;
 import org.apache.servicemix.jbi.container.SpringJBIContainer;
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.tck.Receiver;
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
 /**
- * @version $Revision: 556864 $
+ * @version $Revision$
  */
 public class GroovyChainTest extends TestCase {
-    private static transient Log log = LogFactory.getLog(GroovyChainTest.class);
+
+    private static transient Logger logger = LoggerFactory.getLogger(GroovyChainTest.class);
 
     protected AbstractXmlApplicationContext context;
     protected ServiceMixClient client;
@@ -60,7 +61,7 @@ public class GroovyChainTest extends Tes
         exchange.setService(service);
         client.sendSync(exchange);
         
-        log.info(transformer.toString(exchange.getMessage("out").getContent()));
+        logger.info(transformer.toString(exchange.getMessage("out").getContent()));
     }
 
 
@@ -93,6 +94,6 @@ public class GroovyChainTest extends Tes
 
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/groovy/groovy-chain.xml");
-
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java Tue Jul 19 21:03:14 2011
@@ -22,7 +22,7 @@ import org.springframework.context.suppo
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class GroovyTest extends SpringTestSupport {
 
@@ -34,4 +34,5 @@ public class GroovyTest extends SpringTe
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/groovy/spring-groovy.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java Tue Jul 19 21:03:14 2011
@@ -34,8 +34,6 @@ import javax.xml.transform.stream.Stream
 
 import junit.framework.TestCase;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.MessageExchangeListener;
 import org.apache.servicemix.client.ServiceMixClient;
 import org.apache.servicemix.components.util.ComponentSupport;
@@ -45,13 +43,16 @@ import org.apache.servicemix.jbi.contain
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.tck.Receiver;
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
 /**
- * @version $Revision: 733499 $
+ * @version $Revision$
  */
 public class ServiceMixClientTest extends TestCase {
-    private static transient Log log = LogFactory.getLog(ServiceMixClientTest.class);
+
+    private static transient Logger logger = LoggerFactory.getLogger(ServiceMixClientTest.class);
 
     protected AbstractXmlApplicationContext context;
     protected SpringJBIContainer container;
@@ -151,7 +152,7 @@ public class ServiceMixClientTest extend
             fail("Should have thrown an exception as we have not wired in any container routing information to this client");
         }
         catch (JBIException e) {
-            log.info("Caught expected exception as we have specified no endpoint resolver: " + e);
+            logger.info("Caught expected exception as we have specified no endpoint resolver: ", e);
             assertNotNull(e);
         }
     }
@@ -187,7 +188,7 @@ public class ServiceMixClientTest extend
 
         assertNotNull("Should have returned a non-null response!", response);
 
-        log.info("Received result: " + response);
+        logger.info("Received result: {}", response);
     }
 
 
@@ -209,8 +210,8 @@ public class ServiceMixClientTest extend
         assertNotNull("outMessage is null!", outMessage);
 
         assertEquals("foo header", "hello", outMessage.getProperty("foo"));
-        log.info("Received result: " + outMessage.getContent());
-        log.info("XML is: " + transformer.toString(outMessage.getContent()));
+        logger.info("Received result: {}", outMessage.getContent());
+        logger.info("XML is: {}", transformer.toString(outMessage.getContent()));
     }
 
     protected void assertRequestUsingMapAndPOJOByServiceName(QName service) throws Exception {
@@ -222,7 +223,7 @@ public class ServiceMixClientTest extend
 
         assertNotNull("Should have returned a non-null response!", response);
         
-        log.info("Received result: " + response);
+        logger.info("Received result: {}", response);
     }
 
     protected void setUp() throws Exception {

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/TestBean.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/TestBean.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/TestBean.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/TestBean.java Tue Jul 19 21:03:14 2011
@@ -22,9 +22,10 @@ import java.util.List;
 /**
  * A sample test bean used to test out XStream marshalling
  *
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class TestBean {
+
     private String name;
     private int length;
     private List  addresses = new ArrayList();
@@ -52,4 +53,5 @@ public class TestBean {
     public void setName(String name) {
         this.name = name;
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAndSaajTest.java Tue Jul 19 21:03:14 2011
@@ -27,6 +27,8 @@ import javax.xml.messaging.URLEndpoint;
 import javax.xml.namespace.QName;
 import javax.xml.transform.TransformerException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -36,8 +38,6 @@ import junit.framework.TestCase;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.components.saaj.SaajBinding;
 import org.apache.servicemix.components.util.MockServiceComponent;
 import org.apache.servicemix.jbi.container.ActivationSpec;
@@ -58,7 +58,7 @@ public class HttpSoapAndSaajTest extends
     private static final int PORT_WS_1 = 7014;
     private static final int PORT_WS_2 = 7014;
 
-    private static transient Log log = LogFactory.getLog(HttpSoapAndSaajTest.class);
+    private static transient Logger logger = LoggerFactory.getLogger(HttpSoapAndSaajTest.class);
 
     protected JBIContainer container;
 	protected BrokerService broker;
@@ -140,7 +140,7 @@ public class HttpSoapAndSaajTest extends
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         XMLSerializer serializer = new XMLSerializer(output, format);
         serializer.serialize((Document) node);
-        log.info(output.toString());
+        logger.info(output.toString());
         
         CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
         NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, "//*[local-name() = 'userId']");
@@ -167,4 +167,5 @@ public class HttpSoapAndSaajTest extends
             return root.getNodeValue();
         }
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapAttachmentsTest.java Tue Jul 19 21:03:14 2011
@@ -31,16 +31,17 @@ import junit.framework.TestCase;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
 import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.components.util.EchoComponent;
 import org.apache.servicemix.jbi.container.ActivationSpec;
 import org.apache.servicemix.jbi.container.JBIContainer;
 import org.codehaus.xfire.attachments.JavaMailAttachments;
 import org.codehaus.xfire.attachments.SimpleAttachment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HttpSoapAttachmentsTest extends TestCase {
-    private static transient Log log = LogFactory.getLog(HttpSoapAttachmentsTest.class);
+
+    private static transient Logger logger = LoggerFactory.getLogger(HttpSoapAttachmentsTest.class);
 
     private static final int PORT = 7012;
 
@@ -86,7 +87,7 @@ public class HttpSoapAttachmentsTest ext
         method.setRequestEntity(new InputStreamRequestEntity(is));
         method.setRequestHeader("Content-Type", sendAtts.getContentType());
         new HttpClient().executeMethod(method);
-        log.info(method.getResponseBodyAsString());
+        logger.info(method.getResponseBodyAsString());
     }
 
     private DataHandler createDataHandler(String name) throws MessagingException {

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java Tue Jul 19 21:03:14 2011
@@ -26,6 +26,8 @@ import javax.jbi.messaging.InOnly;
 import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.namespace.QName;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.traversal.NodeIterator;
@@ -36,8 +38,6 @@ import org.apache.commons.httpclient.Htt
 import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.components.util.EchoComponent;
 import org.apache.servicemix.components.util.MockServiceComponent;
 import org.apache.servicemix.components.util.TraceComponent;
@@ -53,7 +53,8 @@ import org.apache.xpath.CachedXPathAPI;
 import org.springframework.core.io.ClassPathResource;
 
 public class HttpSoapTest extends TestCase {
-    private static transient Log log = LogFactory.getLog(HttpSoapTest.class);
+
+    private static transient Logger logger = LoggerFactory.getLogger(HttpSoapTest.class);
 
     protected JBIContainer container;
     
@@ -98,7 +99,7 @@ public class HttpSoapTest extends TestCa
         InputStream is = connection.getInputStream();
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         FileUtil.copyInputStream(is, baos);
-        log.info(baos.toString());
+        logger.info(baos.toString());
     }
 
     public void testInOnly() throws Exception {
@@ -117,7 +118,7 @@ public class HttpSoapTest extends TestCa
         PostMethod method = new PostMethod("http://localhost:" + PORT + "/?name=Guillaume");
         method.setRequestEntity(new InputStreamRequestEntity(getClass().getResourceAsStream("soap-request.xml")));
         new HttpClient().executeMethod(method);
-        log.info(method.getResponseBodyAsString());
+        logger.info(method.getResponseBodyAsString());
     }
 
     public void testMarhaler() throws Exception {
@@ -132,18 +133,18 @@ public class HttpSoapTest extends TestCa
         exchange.setInMessage(in);
         in.setContent(new StringSource("<?xml version='1.0'?><ns1:getQuote xmlns:ns1='urn:xmethods-delayed-quotes' xmlns:xsi='http://www.w3.org/1999/XMLSchema-instance' xmlns:se='http://schemas.xmlsoap.org/soap/envelope/' se:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'><symbol xsi:type='xsd:string'>SUNW</symbol></ns1:getQuote>"));
         marshaler.fromNMS(method, exchange, in);
-        log.info(((StringRequestEntity) method.getRequestEntity()).getContent());
+        logger.info(((StringRequestEntity) method.getRequestEntity()).getContent());
 
         HttpClient httpClient = new HttpClient();
         httpClient.executeMethod(method);
-        log.info(method.getResponseBodyAsString());
+        logger.info(method.getResponseBodyAsString());
         
         exchange = new InOnlyImpl("id");
         in = exchange.createMessage();
         exchange.setInMessage(in);
         marshaler.toNMS(in, method);
         
-        log.info(new SourceTransformer().toString(in.getContent()));
+        logger.info(new SourceTransformer().toString(in.getContent()));
     }
     
     public void testMarshalerNamespaces() throws Exception {
@@ -174,11 +175,11 @@ public class HttpSoapTest extends TestCa
         exchange.setInMessage(in);
         in.setContent(new StringSource("<?xml version='1.0'?><ns1:getQuote xmlns:ns1='urn:xmethods-delayed-quotes' xmlns:xsi='http://www.w3.org/1999/XMLSchema-instance' xmlns:se='http://schemas.xmlsoap.org/soap/envelope/' se:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'><symbol xsi:type='xsd:string'>SUNW</symbol></ns1:getQuote>"));
         marshaler.fromNMS(method, exchange, in);
-        log.info(((StringRequestEntity) method.getRequestEntity()).getContent());
+        logger.info(((StringRequestEntity) method.getRequestEntity()).getContent());
 
         HttpClient httpClient = new HttpClient();
         httpClient.executeMethod(method);
-        log.info(method.getResponseBodyAsString());
+        logger.info(method.getResponseBodyAsString());
         
         exchange = new InOnlyImpl("id");
         in = exchange.createMessage();
@@ -187,7 +188,7 @@ public class HttpSoapTest extends TestCa
         
 
         Node node = new SourceTransformer().toDOMNode(new SourceTransformer().toStreamSource(in.getContent()));
-        log.info(new SourceTransformer().toString(node));
+        logger.info(new SourceTransformer().toString(node));
         
         CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
         NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, "//*[local-name() = 'userId']");
@@ -227,7 +228,7 @@ public class HttpSoapTest extends TestCa
         NormalizedMessage msg = (NormalizedMessage) receiver.getMessageList().flushMessages().get(0);
 
         Node node = new SourceTransformer().toDOMNode(new SourceTransformer().toStreamSource(msg.getContent()));
-        log.info(new SourceTransformer().toString(node));
+        logger.info(new SourceTransformer().toString(node));
         
         CachedXPathAPI cachedXPathAPI = new CachedXPathAPI();
         NodeIterator iterator = cachedXPathAPI.selectNodeIterator(node, "//*[local-name() = 'userId']");

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java Tue Jul 19 21:03:14 2011
@@ -23,17 +23,18 @@ import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.tck.TestSupport;
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
 /**
- * @version $Revision: 359186 $
+ * @version $Revision$
  */
 public class HttpSoapWsTest extends TestSupport {
-    private static transient Log log = LogFactory.getLog(HttpSoapWsTest.class);
+
+    private static transient Logger logger = LoggerFactory.getLogger(HttpSoapWsTest.class);
 
     protected String quote = "SUNW";
 
@@ -57,7 +58,7 @@ public class HttpSoapWsTest extends Test
         BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
         String inputLine;
         while ((inputLine = in.readLine()) != null) {
-            log.info(inputLine);
+            logger.info(inputLine);
         }
         in.close();
     }
@@ -65,4 +66,5 @@ public class HttpSoapWsTest extends Test
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/http/ws-example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java Tue Jul 19 21:03:14 2011
@@ -26,19 +26,20 @@ import java.net.URLConnection;
 
 import javax.xml.namespace.QName;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.tck.TestSupport;
 import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 
 /**
- * @version $Revision: 556864 $
+ * @version $Revision$
  */
 public class HttpTest extends TestSupport {
-    private static transient Log log = LogFactory.getLog(HttpTest.class);
+
+    private static transient Logger logger = LoggerFactory.getLogger(HttpTest.class);
 
     protected String quote = "SUNW";
     
@@ -67,14 +68,13 @@ public class HttpTest extends TestSuppor
         Object answer = requestServiceWithFileRequest(serviceName, file);
         assertTrue("Shoud return a DOM Node: " + answer, answer instanceof Node);
         Node node = (Node) answer;
-        log.info(transformer.toString(node));
+        logger.info(transformer.toString(node));
 
         String text = textValueOfXPath(node, "//Result").trim();
 
-        log.info("Found price: " + text);
+        logger.info("Found price: {}", text);
 
         assertTrue("price text should not be empty", text.length() > 0);
-
     }
     
     public void testWithURLConnection() throws Exception {
@@ -97,7 +97,7 @@ public class HttpTest extends TestSuppor
         BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
         String inputLine;
         while ((inputLine = in.readLine()) != null) {
-            log.info(inputLine);
+            logger.info(inputLine);
         }
         in.close();
     }
@@ -105,4 +105,5 @@ public class HttpTest extends TestSuppor
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/http/example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java Tue Jul 19 21:03:14 2011
@@ -23,7 +23,7 @@ import org.apache.xbean.spring.context.C
 import javax.xml.namespace.QName;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class JabberChatTest extends TestSupport {
 
@@ -36,4 +36,5 @@ public class JabberChatTest extends Test
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/jabber/example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java Tue Jul 19 21:03:14 2011
@@ -23,7 +23,7 @@ import org.apache.xbean.spring.context.C
 import javax.xml.namespace.QName;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class JabberChatWithActiveMQTest extends TestSupport {
 
@@ -36,4 +36,5 @@ public class JabberChatWithActiveMQTest 
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/jabber/activemqAsServer.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java Tue Jul 19 21:03:14 2011
@@ -23,7 +23,7 @@ import org.apache.xbean.spring.context.C
 import javax.xml.namespace.QName;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class JabberGroupChatTest extends TestSupport {
 
@@ -36,4 +36,5 @@ public class JabberGroupChatTest extends
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/jabber/group-example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java Tue Jul 19 21:03:14 2011
@@ -23,7 +23,7 @@ import org.apache.xbean.spring.context.C
 import javax.xml.namespace.QName;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class JmsOverJcaTest extends TestSupport {
 
@@ -36,4 +36,5 @@ public class JmsOverJcaTest extends Test
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/jca/example.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java Tue Jul 19 21:03:14 2011
@@ -23,7 +23,7 @@ import org.apache.xbean.spring.context.C
 import javax.xml.namespace.QName;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class JmsOverJcaWithFullXATest extends TestSupport {
 
@@ -37,4 +37,5 @@ public class JmsOverJcaWithFullXATest ex
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/jca/xa-on-jca-flow.xml");
     }
+
 }

Modified: servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java?rev=1148530&r1=1148529&r2=1148530&view=diff
==============================================================================
--- servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java (original)
+++ servicemix/smx3/trunk/common/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java Tue Jul 19 21:03:14 2011
@@ -23,7 +23,7 @@ import org.apache.xbean.spring.context.C
 import javax.xml.namespace.QName;
 
 /**
- * @version $Revision: 426415 $
+ * @version $Revision$
  */
 public class JmsOverJcaWithXATest extends TestSupport {
 
@@ -36,4 +36,5 @@ public class JmsOverJcaWithXATest extend
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/jca/exampleWithXA.xml");
     }
+
 }



Mime
View raw message