Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.virgo.medic.integrationtest/src')
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties2
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/config-fragment/logback.xml12
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_1/logback.xml6
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_2/logback.xml6
4 files changed, 13 insertions, 13 deletions
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
index a1ce87c..dd3e357 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/META-INF/test.config.properties
@@ -1,6 +1,6 @@
launcher.bundles=\
file:../ivy-cache/repository/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar@start,\
-file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar@start,\
+file:../ivy-cache/repository/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar@start,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.common/2.1.0.D-20100727175631/org.eclipse.virgo.util.common-2.1.0.D-20100727175631.jar,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.D-20100727175631/org.eclipse.virgo.util.osgi-2.1.0.D-20100727175631.jar,\
file:../ivy-cache/repository/org.eclipse.virgo.util/org.eclipse.virgo.util.parser.manifest/2.1.0.D-20100727175631/org.eclipse.virgo.util.parser.manifest-2.1.0.D-20100727175631.jar,\
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/config-fragment/logback.xml b/org.eclipse.virgo.medic.integrationtest/src/test/resources/config-fragment/logback.xml
index 1332bac..46dc429 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/config-fragment/logback.xml
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/config-fragment/logback.xml
@@ -1,21 +1,21 @@
<configuration>
<appender name="localized-console" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>Localized: %-24.24thread &lt;%X{medic.eventCode}&gt; %msg %ex%n</Pattern>
- </layout>
+ </encoder>
</appender>
<appender name="default-console" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>Default: %-24.24thread &lt;%X{medic.eventCode}&gt; %msg %ex%n</Pattern>
- </layout>
+ </encoder>
</appender>
<appender name="root-console" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>Root: [%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread %msg %ex%n</Pattern>
- </layout>
+ </encoder>
</appender>
<appender name="root-stub" class="org.eclipse.virgo.medic.log.appender.StubAppender"/>
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_1/logback.xml b/org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_1/logback.xml
index 2862b7b..fb6aadb 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_1/logback.xml
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_1/logback.xml
@@ -1,8 +1,8 @@
<configuration>
<appender name="STDOUT" class="org.eclipse.virgo.medic.log.logback.ReroutingAwareConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread %msg %ex%n</Pattern>
- </layout>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread %msg %ex%n</pattern>
+ </encoder>
</appender>
<appender name="bundle1-stub" class="org.eclipse.virgo.medic.log.appender.StubAppender"/>
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_2/logback.xml b/org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_2/logback.xml
index 2f914b7..6423138 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_2/logback.xml
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/test-bundle_2/logback.xml
@@ -1,8 +1,8 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <layout class="ch.qos.logback.classic.PatternLayout">
- <Pattern>Bundle2 [%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread %msg %ex%n</Pattern>
- </layout>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>Bundle2 [%d{yyyy-MM-dd HH:mm:ss.SSS}] %-24.24thread %msg %ex%n</pattern>
+ </encoder>
</appender>
<appender name="bundle2-stub" class="org.eclipse.virgo.medic.log.appender.StubAppender"/>

Back to the top