commit e7fd6c27fdb1c7f7826ee17b5603c73c968a4329
author Pierre De Rop <pderop@apache.org> Sun Oct 13 08:53:42 2013 +0000
committer Pierre De Rop <pderop@apache.org> Sun Oct 13 08:53:42 2013 +0000
tree c6e55ecd6b35ccb13045afdff4b0f71c293dd559
parent cdd26d9b1db6b397b94bd2ed6fec9d081aade51f

Don't log current thread twice

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1531638 13f79535-47bb-0310-9956-ffa450edef68

dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java

diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
index 13be4e6..8802c9c 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
@@ -107,12 +107,9 @@
                 mavenBundle("org.apache.felix", "org.apache.felix.shell", "1.4.2"),
                 mavenBundle("org.apache.felix", "org.apache.felix.deploymentadmin", "0.9.0").start(false),
                 mavenBundle("org.ops4j.pax.tinybundles", "tinybundles", "1.0.0"),
-                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager",
-                        "3.1.1-SNAPSHOT"),
-                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell",
-                        "3.0.2-SNAPSHOT"),
-                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.runtime",
-                        "3.1.1-SNAPSHOT"),
+                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager","3.1.1-SNAPSHOT"),
+                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell", "3.0.2-SNAPSHOT"),
+                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.runtime", "3.1.1-SNAPSHOT"),
                 bundle(bundleFile.toURI().toString()));
         final Option option = (paxRunnerVmOption != null) ? vmOption(paxRunnerVmOption) : null;
         return OptionUtils.combine(base, option);
@@ -300,26 +297,26 @@
     }
 
     protected void warn(String msg) {
-        log(LogService.LOG_WARNING, "[" + Thread.currentThread().getName() + "] " + msg);
+        log(LogService.LOG_WARNING, msg);
     }
 
     protected void info(String msg) {
-        log(LogService.LOG_INFO, "[" + Thread.currentThread().getName() + "] " + msg);
+        log(LogService.LOG_INFO, msg);
     }
 
     protected void debug(String msg) {
-        log(LogService.LOG_DEBUG, "[" + Thread.currentThread().getName() + "] " + msg);
+        log(LogService.LOG_DEBUG, msg);
     }
 
     protected void error(String msg) {
-        log(LogService.LOG_ERROR, "[" + Thread.currentThread().getName() + "] " + msg);
+        log(LogService.LOG_ERROR, msg);
     }
 
     protected void error(String msg, Throwable err) {
-        log(LogService.LOG_ERROR, "[" + Thread.currentThread().getName() + "] " + msg, err);
+        log(LogService.LOG_ERROR, msg, err);
     }
 
     protected void error(Throwable err) {
-        log(LogService.LOG_ERROR, "[" + Thread.currentThread().getName() + "] error:", err);
+        log(LogService.LOG_ERROR, "error", err);
     }
 }