commit da10cc6ee678b3d762e2c510b264158106c2e6ad
author Pierre De Rop <pderop@apache.org> Fri Jan 10 11:27:00 2014 +0000
committer Pierre De Rop <pderop@apache.org> Fri Jan 10 11:27:00 2014 +0000
tree b15274522d814ba537dce22490db43d637710d24
parent 7993b2ee6e543befb81a3acfd688d46bbe9f8eea

Use configadmin 1.8.0; improved logging methods, using varargs in order to allow using String.format.
For example: 

  debug("debug message %s", object);




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

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

diff --git a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
index c74f501..7f90be9 100644
--- a/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
+++ b/dependencymanager/test/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
@@ -142,7 +142,7 @@
                 junitBundles(),
                 bootDelegationPackages("org.netbeans.*"), // For jvisualvm
                 mavenBundle("org.apache.felix", "org.apache.felix.metatype", "1.0.8"),
-                mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.6.0"),
+                mavenBundle("org.apache.felix", "org.apache.felix.configadmin", "1.8.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.gogo.runtime", "0.10.0"),
                 mavenBundle("org.apache.felix", "org.apache.felix.deploymentadmin", "0.9.0").start(false),
                 mavenBundle("org.ops4j.pax.tinybundles", "tinybundles", "1.0.0"),
@@ -360,24 +360,30 @@
         }
     }
 
-    protected void warn(String msg) {
-        log(LogService.LOG_WARNING, msg);
+    protected void warn(String msg, Object ... params) {
+	if (LOG_LEVEL >= LogService.LOG_WARNING) {
+	    log(LogService.LOG_WARNING, params.length > 0 ? String.format(msg, params) : msg);
+	}
     }
 
-    protected void info(String msg) {
-        log(LogService.LOG_INFO, msg);
+    protected void info(String msg, Object ... params) {
+	if (LOG_LEVEL >= LogService.LOG_INFO) {
+	    log(LogService.LOG_INFO, params.length > 0 ? String.format(msg, params) : msg);
+	}
     }
 
-    protected void debug(String msg) {
-        log(LogService.LOG_DEBUG, msg);
+    protected void debug(String msg, Object ... params) {
+	if (LOG_LEVEL >= LogService.LOG_DEBUG) {
+	    log(LogService.LOG_DEBUG, params.length > 0 ? String.format(msg, params) : msg);
+	}
     }
 
-    protected void error(String msg) {
-        log(LogService.LOG_ERROR, msg);
+    protected void error(String msg, Object ... params) {
+        log(LogService.LOG_ERROR, params.length > 0 ? String.format(msg, params) : msg);
     }
 
-    protected void error(String msg, Throwable err) {
-        log(LogService.LOG_ERROR, msg, err);
+    protected void error(String msg, Throwable err, Object ... params) {
+        log(LogService.LOG_ERROR, params.length > 0 ? String.format(msg, params) : msg, err);
     }
 
     protected void error(Throwable err) {