You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2013/10/13 10:53:42 UTC
svn commit: r1531638 -
/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
Author: pderop
Date: Sun Oct 13 08:53:42 2013
New Revision: 1531638
URL: http://svn.apache.org/r1531638
Log:
Don't log current thread twice
Modified:
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java?rev=1531638&r1=1531637&r2=1531638&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java Sun Oct 13 08:53:42 2013
@@ -107,12 +107,9 @@ public abstract class TestBase implement
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 @@ public abstract class TestBase implement
}
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);
}
}