diff options
| author | Christopher Frost | 2010-08-04 15:55:34 +0000 |
|---|---|---|
| committer | Christopher Frost | 2010-08-04 15:55:34 +0000 |
| commit | 66e6456ebc2ae1dffa887bce606bbfcc8c46aba1 (patch) | |
| tree | 59310abd90e855c3750bbd42d68dce800420f5f6 /org.eclipse.virgo.medic.integrationtest/src/test | |
| parent | 1f37aea99075ba3b33091f4152d3027ed1ec7891 (diff) | |
| download | org.eclipse.virgo.medic-66e6456ebc2ae1dffa887bce606bbfcc8c46aba1.tar.gz org.eclipse.virgo.medic-66e6456ebc2ae1dffa887bce606bbfcc8c46aba1.tar.xz org.eclipse.virgo.medic-66e6456ebc2ae1dffa887bce606bbfcc8c46aba1.zip | |
[DMS-2794] Upgrading the version of Logback and SLF4J being used
Diffstat (limited to 'org.eclipse.virgo.medic.integrationtest/src/test')
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 <%X{medic.eventCode}> %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 <%X{medic.eventCode}> %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"/> |