Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-10-10 15:51:09 -0400
committerChristopher Frost2012-10-10 15:51:09 -0400
commit1e5c270db596c530105b92c79e828af5c233ab95 (patch)
tree3c1743caf54187c4015867cec15b8553ceef74df
parent5d7d38ba628a37df3c0f679ca8d106436e41185d (diff)
parent3fb2b503983ddb2c5ae89c844f77b49c1a70a9a2 (diff)
downloadorg.eclipse.virgo.kernel-1e5c270db596c530105b92c79e828af5c233ab95.tar.gz
org.eclipse.virgo.kernel-1e5c270db596c530105b92c79e828af5c233ab95.tar.xz
org.eclipse.virgo.kernel-1e5c270db596c530105b92c79e828af5c233ab95.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.kernel
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml2
-rw-r--r--org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml2
3 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml
index 17924731..ebfb8fb4 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/resources/config/serviceability.xml
@@ -1,5 +1,7 @@
<configuration>
+ <jmxConfigurator />
+
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
<appender name="LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml b/org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml
index fcbb1de3..667c8a78 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/config/serviceability.xml
@@ -1,5 +1,7 @@
<configuration>
+ <jmxConfigurator />
+
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
<appender name="LOG_STDOUT" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml b/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml
index 160aa623..1ebbacb8 100644
--- a/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml
+++ b/org.eclipse.virgo.kernel.test/src/test/resources/sit-config/serviceability.xml
@@ -1,5 +1,7 @@
<configuration>
+ <jmxConfigurator />
+
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/>
<appender name="LOG_STDOUT" class="ch.qos.logback.core.ConsoleAppender">

Back to the top