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 | |
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
13 files changed, 40 insertions, 34 deletions
diff --git a/build.versions b/build.versions index 294cdbc..8883001 100644 --- a/build.versions +++ b/build.versions @@ -1,6 +1,6 @@ # Compile -ch.qos.logback=0.9.18 -org.slf4j=1.5.10 +ch.qos.logback=0.9.24 +org.slf4j=1.6.1 org.eclipse.osgi=3.5.1.R35x_v20091005 org.apache.felix.configadmin=1.2.4 org.aspectj=1.6.6.RELEASE diff --git a/org.eclipse.virgo.medic.core/.classpath b/org.eclipse.virgo.medic.core/.classpath index 233fb90..78e0d70 100644 --- a/org.eclipse.virgo.medic.core/.classpath +++ b/org.eclipse.virgo.medic.core/.classpath @@ -28,9 +28,9 @@ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/MEDIC_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.D-20100727175207/org.eclipse.virgo.teststubs.osgi-2.1.0.D-20100727175207.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/2.1.0.D-20100727175207/org.eclipse.virgo.teststubs.osgi-sources-2.1.0.D-20100727175207.jar"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-1.6.6.RELEASE.jar" sourcepath="/MEDIC_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-sources-1.5.10.jar"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.18/com.springsource.ch.qos.logback.classic-0.9.18.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.18/com.springsource.ch.qos.logback.classic-sources-0.9.18.jar"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.18/com.springsource.ch.qos.logback.core-0.9.18.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.18/com.springsource.ch.qos.logback.core-sources-0.9.18.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/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" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.osgi/2.1.0.D-20100727175631/org.eclipse.virgo.util.osgi-sources-2.1.0.D-20100727175631.jar"/> <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.medic.weaving"/> diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLogger.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLogger.java index 85008c6..074e55b 100644 --- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLogger.java +++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/eventlog/impl/logback/LogBackEventLogger.java @@ -83,7 +83,7 @@ class LogBackEventLogger implements EventLogger { private void logMessage(Logger logger, String message, Level level, String eventCode, Throwable throwable, Object... inserts) { try { MDC.put(MDC_KEY_MEDIC_EVENT_CODE, eventCode); - String formattedMessage = MessageFormatter.arrayFormat(message, (Object[]) inserts); + String formattedMessage = MessageFormatter.arrayFormat(message, (Object[]) inserts).getMessage(); switch (level) { case ERROR: logger.error(formattedMessage, throwable); diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/logback/ReroutingAwareConsoleAppender.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/logback/ReroutingAwareConsoleAppender.java index 0463c47..21ccd14 100644 --- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/logback/ReroutingAwareConsoleAppender.java +++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/logback/ReroutingAwareConsoleAppender.java @@ -12,7 +12,6 @@ package org.eclipse.virgo.medic.log.logback; import java.io.OutputStream; -import java.io.OutputStreamWriter; import org.eclipse.virgo.medic.log.impl.LoggingPrintStreamWrapper; @@ -32,11 +31,16 @@ import ch.qos.logback.core.ConsoleAppender; */ public class ReroutingAwareConsoleAppender<E> extends ConsoleAppender<E> { - protected OutputStreamWriter createWriter(OutputStream os) { - if (os instanceof LoggingPrintStreamWrapper) { - return super.createWriter(((LoggingPrintStreamWrapper)os).getOriginalPrintStream()); + /** + * This is responsible for ensuring the Appender is using the right output stream as it may have been wrapped. + */ + @Override + public void setOutputStream(OutputStream outputStream) { + if (outputStream instanceof LoggingPrintStreamWrapper) { + super.setOutputStream(((LoggingPrintStreamWrapper)outputStream).getOriginalPrintStream()); } else { - return super.createWriter(os); + super.setOutputStream(outputStream); } } + } diff --git a/org.eclipse.virgo.medic.core/template.mf b/org.eclipse.virgo.medic.core/template.mf index c3f35c3..65e93a6 100644 --- a/org.eclipse.virgo.medic.core/template.mf +++ b/org.eclipse.virgo.medic.core/template.mf @@ -22,9 +22,11 @@ Import-Template: org.slf4j.*;version="${org.slf4j:[=.=.=, +1.0.0)}", org.xml.sax.*;version="0" Excluded-Imports: - org.codehaus.janino.* + org.codehaus.janino.*, + org.codehaus.groovy.*, + groovy.lang Export-Template: - org.slf4j.impl;version="1.5.10", + org.slf4j.impl;version="1.6.1", ch.qos.logback.*;version="${ch.qos.logback}" Excluded-Exports: org.eclipse.virgo.medic.* diff --git a/org.eclipse.virgo.medic.integrationtest/.classpath b/org.eclipse.virgo.medic.integrationtest/.classpath index d58ce53..e6d649a 100644 --- a/org.eclipse.virgo.medic.integrationtest/.classpath +++ b/org.eclipse.virgo.medic.integrationtest/.classpath @@ -23,9 +23,9 @@ <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/MEDIC_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-sources-1.5.10.jar"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.18/com.springsource.ch.qos.logback.classic-0.9.18.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.18/com.springsource.ch.qos.logback.classic-sources-0.9.18.jar"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.18/com.springsource.ch.qos.logback.core-0.9.18.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.18/com.springsource.ch.qos.logback.core-sources-0.9.18.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100727180048/org.eclipse.virgo.test.framework-2.1.0.D-20100727180048.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.virgo.test/org.eclipse.virgo.test.framework/2.1.0.D-20100727180048/org.eclipse.virgo.test.framework-sources-2.1.0.D-20100727180048.jar"/> <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar" sourcepath="/MEDIC_IVY_CACHE/org.apache.felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-sources-1.2.4.jar"/> 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"/> diff --git a/org.eclipse.virgo.medic.testfragment/.classpath b/org.eclipse.virgo.medic.testfragment/.classpath index 6635d80..d843393 100644 --- a/org.eclipse.virgo.medic.testfragment/.classpath +++ b/org.eclipse.virgo.medic.testfragment/.classpath @@ -23,6 +23,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/> <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-sources-1.5.10.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/org.eclipse.virgo.medic.weaving/.classpath b/org.eclipse.virgo.medic.weaving/.classpath index 39a8162..6299087 100644 --- a/org.eclipse.virgo.medic.weaving/.classpath +++ b/org.eclipse.virgo.medic.weaving/.classpath @@ -21,10 +21,10 @@ </attributes> </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.18/com.springsource.ch.qos.logback.core-0.9.18.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.18/com.springsource.ch.qos.logback.core-sources-0.9.18.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.core/0.9.24/com.springsource.ch.qos.logback.core-sources-0.9.24.jar"/> <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-sources-1.5.10.jar"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.18/com.springsource.ch.qos.logback.classic-0.9.18.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.18/com.springsource.ch.qos.logback.classic-sources-0.9.18.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-0.9.24.jar" sourcepath="/MEDIC_IVY_CACHE/ch.qos.logback/com.springsource.ch.qos.logback.classic/0.9.24/com.springsource.ch.qos.logback.classic-sources-0.9.24.jar"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.medic"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/MEDIC_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/> diff --git a/org.eclipse.virgo.medic/.classpath b/org.eclipse.virgo.medic/.classpath index 6635d80..d843393 100644 --- a/org.eclipse.virgo.medic/.classpath +++ b/org.eclipse.virgo.medic/.classpath @@ -23,6 +23,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-3.5.1.R35x_v20091005.jar" sourcepath="/MEDIC_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.5.1.R35x_v20091005/org.eclipse.osgi-sources-3.5.1.R35x_v20091005.jar"/> <classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/> - <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-1.5.10.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.5.10/com.springsource.slf4j.api-sources-1.5.10.jar"/> + <classpathentry kind="var" path="MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-1.6.1.jar" sourcepath="/MEDIC_IVY_CACHE/org.slf4j/com.springsource.slf4j.api/1.6.1/com.springsource.slf4j.api-sources-1.6.1.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> |