Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

2 files changed, 4 insertions, 6 deletions

diff --git a/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/ValidatorTest.java b/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/ValidatorTest.java
index c5b54a56..daf662dc 100644
--- a/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/ValidatorTest.java
+++ b/BKUViewer/src/test/java/at/gv/egiz/bku/slxhtml/ValidatorTest.java
@@ -20,9 +20,8 @@ import static org.junit.Assert.assertNotNull;
 
 import java.io.InputStream;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Ignore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Test;
 
 import at.gv.egiz.bku.viewer.ValidationException;
@@ -32,7 +31,7 @@ import at.gv.egiz.bku.viewer.ValidatorFactory;
 //@Ignore
 public class ValidatorTest {
   
-  private static Log log = LogFactory.getLog(ValidatorTest.class);
+  private static Logger log = LoggerFactory.getLogger(ValidatorTest.class);
   
   @Test
   public void testGetInstance() {
@@ -60,7 +59,7 @@ public class ValidatorTest {
       throw e;
     }
     long t1 = System.currentTimeMillis();
-    log.info("Validated SLXHTML file '" + slxhtmlFile + "' in " + (t1 - t0) + "ms.");
+    log.info("Validated SLXHTML file '{}' in {}ms.", slxhtmlFile, t1 - t0);
     
   }
   
diff --git a/BKUViewer/src/test/resources/commons-logging.properties b/BKUViewer/src/test/resources/commons-logging.properties
deleted file mode 100644
index 29292562..00000000
--- a/BKUViewer/src/test/resources/commons-logging.properties
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger