You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2011/03/25 22:45:21 UTC

svn commit: r1085570 - in /servicemix/utils/trunk/src: main/java/org/apache/servicemix/components/util/ main/java/org/apache/servicemix/executors/impl/ main/java/org/apache/servicemix/expression/ main/java/org/apache/servicemix/id/ main/java/org/apache...

Author: gertv
Date: Fri Mar 25 21:45:21 2011
New Revision: 1085570

URL: http://svn.apache.org/viewvc?rev=1085570&view=rev
Log:
SM-2064: Switch to SLF4J for servicemix-utils

Modified:
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JAXPXPathXStreamExpression.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenXPathExpression.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/id/IdGenerator.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapterFactory.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/hazelcast/HazelcastStore.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/jdbc/JdbcStore.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/TimeoutMemoryStore.java
    servicemix/utils/trunk/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java
    servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java
    servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java
    servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/components/util/SimpleFlatFileMarshaler.java Fri Mar 25 21:45:21 2011
@@ -34,8 +34,8 @@ import javax.jbi.messaging.MessageExchan
 import javax.jbi.messaging.NormalizedMessage;
 
 import javax.xml.transform.stream.StreamSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple flat file marshaler that can read fixed-length and csv text files
@@ -67,7 +67,7 @@ public class SimpleFlatFileMarshaler ext
     private static final String XML_CLOSE_ATTR_NEWLINE = "\">\n";
     private static final String XML_CLOSE_ATTR = "\">";
 
-    protected final Log log = LogFactory.getLog(getClass());
+    protected final Logger log = LoggerFactory.getLogger(getClass());
     
     private boolean xmlDeclaration = true;
 

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/executors/impl/ExecutorFactoryImpl.java Fri Mar 25 21:45:21 2011
@@ -18,6 +18,8 @@ package org.apache.servicemix.executors.
 
 import org.apache.servicemix.executors.Executor;
 import org.apache.servicemix.executors.ExecutorFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.management.ObjectName;
 import java.lang.reflect.Method;
@@ -43,7 +45,7 @@ import java.util.concurrent.atomic.Atomi
  */
 public class ExecutorFactoryImpl implements ExecutorFactory {
 
-    private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory.getLog(ExecutorFactoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ExecutorFactoryImpl.class);
 
     private static final String OBJECT_NAME_PREFIX = "org.apache.servicemix:ContainerName=ServiceMix,Name=Executors,Type=";
     private static final String OBJECT_NAME_POSTFIX = ",SubType=";

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JAXPXPathXStreamExpression.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JAXPXPathXStreamExpression.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JAXPXPathXStreamExpression.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JAXPXPathXStreamExpression.java Fri Mar 25 21:45:21 2011
@@ -21,14 +21,14 @@ import javax.jbi.messaging.MessagingExce
 import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.xpath.XPathConstants;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.xml.DomReader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 
 /**
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  */
 public class JAXPXPathXStreamExpression extends JAXPXPathExpression {
 
-    protected Log logger = LogFactory.getLog(JAXPXPathXStreamExpression.class);
+    protected Logger logger = LoggerFactory.getLogger(JAXPXPathXStreamExpression.class);
     private XStream xStream;
 
     public JAXPXPathXStreamExpression() {

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenXPathExpression.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenXPathExpression.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenXPathExpression.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/expression/JaxenXPathExpression.java Fri Mar 25 21:45:21 2011
@@ -25,12 +25,12 @@ import javax.xml.parsers.ParserConfigura
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.stream.StreamSource;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 
 import org.xml.sax.SAXException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.jaxen.FunctionContext;
@@ -48,7 +48,7 @@ import org.springframework.beans.factory
  */
 public class JaxenXPathExpression implements Expression, InitializingBean {
     
-    private static final transient Log LOG = LogFactory.getLog(JaxenXPathExpression.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(JaxenXPathExpression.class);
 
     private String xpath;
 

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/id/IdGenerator.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/id/IdGenerator.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/id/IdGenerator.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/id/IdGenerator.java Fri Mar 25 21:45:21 2011
@@ -21,19 +21,19 @@ package org.apache.servicemix.id;
  * http://svn.apache.org/repos/asf/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/util/IdGenerator.java
  */
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.InetAddress;
 import java.net.ServerSocket;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * Generator for Globally unique Strings.
  */
 
 public class IdGenerator {
 
-    private static final Log LOG = LogFactory.getLog(IdGenerator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IdGenerator.class);
 
     private static final String UNIQUE_STUB;
 

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapterFactory.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapterFactory.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapterFactory.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/JDBCAdapterFactory.java Fri Mar 25 21:45:21 2011
@@ -19,14 +19,14 @@ package org.apache.servicemix.jdbc;
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.finder.FactoryFinder;
 import org.apache.servicemix.jdbc.adapter.DefaultJDBCAdapter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class JDBCAdapterFactory {
 
-    private static final Log LOG = LogFactory.getLog(JDBCAdapterFactory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JDBCAdapterFactory.class);
     private static FactoryFinder factoryFinder = new FactoryFinder("META-INF/services/org/apache/servicemix/jdbc/");
 
     private JDBCAdapterFactory() {

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/jdbc/adapter/DefaultJDBCAdapter.java Fri Mar 25 21:45:21 2011
@@ -27,11 +27,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jdbc.JDBCAdapter;
 import org.apache.servicemix.jdbc.JDBCAdapterFactory;
 import org.apache.servicemix.jdbc.Statements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implements all the default JDBC operations that are used by the
@@ -50,7 +50,7 @@ import org.apache.servicemix.jdbc.Statem
  */
 public class DefaultJDBCAdapter implements JDBCAdapter {
 
-    private static final Log LOG = LogFactory.getLog(DefaultJDBCAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultJDBCAdapter.class);
 
     protected Statements statements;
 

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/hazelcast/HazelcastStore.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/hazelcast/HazelcastStore.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/hazelcast/HazelcastStore.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/hazelcast/HazelcastStore.java Fri Mar 25 21:45:21 2011
@@ -23,10 +23,10 @@ import com.hazelcast.core.IdGenerator;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.store.Entry;
 import org.apache.servicemix.store.Store;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -34,7 +34,7 @@ import org.apache.servicemix.store.Store
  */
 public class HazelcastStore implements Store, Serializable {
 
-    private static final Log LOG = LogFactory.getLog(HazelcastStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HazelcastStore.class);
 
     private Map<String, Entry> datas;
 

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/jdbc/JdbcStore.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/jdbc/JdbcStore.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/jdbc/JdbcStore.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/jdbc/JdbcStore.java Fri Mar 25 21:45:21 2011
@@ -23,13 +23,13 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.sql.Connection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.store.Store;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JdbcStore implements Store {
 
-    private static final Log LOG = LogFactory.getLog(JdbcStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JdbcStore.class);
 
     private JdbcStoreFactory factory;
     private String name;

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/MemoryStore.java Fri Mar 25 21:45:21 2011
@@ -20,10 +20,10 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.id.IdGenerator;
 import org.apache.servicemix.store.Store;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple memory store implementation based on a simple map.
@@ -33,7 +33,7 @@ import org.apache.servicemix.store.Store
  */
 public class MemoryStore implements Store {
 
-    private static final Log LOG = LogFactory.getLog(MemoryStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MemoryStore.class);
 
     private Map<String, Object> datas = new ConcurrentHashMap<String, Object>();
 

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/TimeoutMemoryStore.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/TimeoutMemoryStore.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/TimeoutMemoryStore.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/store/memory/TimeoutMemoryStore.java Fri Mar 25 21:45:21 2011
@@ -20,10 +20,10 @@ import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.id.IdGenerator;
 import org.apache.servicemix.store.Entry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * {@link MemoryStore} which removes entries from the store after the specified timeout
@@ -31,7 +31,7 @@ import org.apache.servicemix.store.Entry
  */
 public class TimeoutMemoryStore extends MemoryStore {
 
-    private static final Log LOG = LogFactory.getLog(TimeoutMemoryStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TimeoutMemoryStore.class);
     private ConcurrentMap<String, Entry> datas = new ConcurrentHashMap<String, Entry>();
     private final long timeout;
 

Modified: servicemix/utils/trunk/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java (original)
+++ servicemix/utils/trunk/src/main/java/org/apache/servicemix/timers/impl/TimerManagerImpl.java Fri Mar 25 21:45:21 2011
@@ -19,15 +19,15 @@ package org.apache.servicemix.timers.imp
 import java.util.Date;
 import java.util.TimerTask;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.timers.Timer;
 import org.apache.servicemix.timers.TimerListener;
 import org.apache.servicemix.timers.TimerManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TimerManagerImpl implements TimerManager {
 
-    private static final Log LOG = LogFactory.getLog(TimerManagerImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TimerManagerImpl.class);
 
     private java.util.Timer timer;
 

Modified: servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java (original)
+++ servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/FragmentStreamReaderTest.java Fri Mar 25 21:45:21 2011
@@ -28,25 +28,24 @@ import javax.xml.transform.TransformerFa
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 public class FragmentStreamReaderTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(FragmentStreamReaderTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FragmentStreamReaderTest.class);
 
     public void testStaxSource() throws Exception {
         InputStream is = getClass().getResourceAsStream("test.xml");
         XMLStreamReader xsr = XMLInputFactory.newInstance().createXMLStreamReader(is);
         xsr = new ExtendedXMLStreamReader(xsr);
         xsr.nextTag();
-        LOG.info(xsr.getName());
+        LOG.info(xsr.getName().toString());
         xsr.nextTag();
-        LOG.info(xsr.getName());
+        LOG.info(xsr.getName().toString());
         XMLStreamReader fsr = new FragmentStreamReader(xsr);
         StaxSource ss = new StaxSource(fsr);
         StringWriter buffer = new StringWriter();

Modified: servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java (original)
+++ servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/StaxSourceTest.java Fri Mar 25 21:45:21 2011
@@ -31,18 +31,17 @@ import javax.xml.transform.sax.SAXSource
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 public class StaxSourceTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(StaxSourceTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StaxSourceTest.class);
 
     public void testStaxSourceOnStream() throws Exception {
         InputStream is = getClass().getResourceAsStream("test.xml");

Modified: servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java
URL: http://svn.apache.org/viewvc/servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java?rev=1085570&r1=1085569&r2=1085570&view=diff
==============================================================================
--- servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java (original)
+++ servicemix/utils/trunk/src/test/java/org/apache/servicemix/jbi/jaxp/W3CDOMStreamReaderTest.java Fri Mar 25 21:45:21 2011
@@ -28,21 +28,20 @@ import javax.xml.transform.TransformerFa
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 /**
  * @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
  * @since Oct 26, 2004
  */
 public class W3CDOMStreamReaderTest extends AbstractStreamReaderTest {
 
-    private static final Log LOG = LogFactory.getLog(W3CDOMStreamReaderTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(W3CDOMStreamReaderTest.class);
 
     public void testSingleElement() throws Exception {
         Document doc = getDocument();
@@ -100,7 +99,7 @@ public class W3CDOMStreamReaderTest exte
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         writeXml(doc, baos);
-        LOG.info(baos);
+        LOG.info(baos.toString());
 
         W3CDOMStreamReader reader = new W3CDOMStreamReader(e);
         testMixedContent(reader);