Modified: felix/trunk/logback/itests/standard-jcl/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jcl/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jcl/pom.xml (original) +++ felix/trunk/logback/itests/standard-jcl/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.standard.jcl</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project>
Modified: felix/trunk/logback/itests/standard-jul/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jul/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jul/itest.bndrun (original) +++ felix/trunk/logback/itests/standard-jul/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,26 +1,23 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 --resolve.effective: resolve, active +-resolve.effective: resolve -runfw: org.apache.felix.framework -runrequires:\ - osgi.identity;filter:='(osgi.identity=jul.to.slf4j)',\ osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.log)',\ + osgi.identity;filter:='(osgi.identity=org.apache.felix.logback)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.jul)' -runproperties: \ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - slf4j.api;version='[1.7.25,1.7.26)',\ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - jul.to.slf4j;version='[1.7.25,1.7.26)',\ - org.apache.felix.logback.itests.standard.jul;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ + ch.qos.logback.core;version='[1.2.3,1.2.4)',\ + org.apache.felix.log;version='[1.2.0,1.2.1)',\ + org.apache.felix.logback.itests.standard.jul;version='[1.0.0,1.0.1)',\ + org.apache.felix.logback;version='[1.0.1,1.0.2)',\ + slf4j.api;version='[1.7.25,1.7.26)' Modified: felix/trunk/logback/itests/standard-jul/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jul/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jul/logback.xml (original) +++ felix/trunk/logback/itests/standard-jul/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/standard-jul/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jul/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jul/pom.xml (original) +++ felix/trunk/logback/itests/standard-jul/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,9 +19,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -32,22 +32,9 @@ <dependencies> <dependency> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> + <artifactId>org.apache.felix.log</artifactId> + <version>1.2.0</version> + <scope>runtime</scope> </dependency> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java (original) +++ felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java Mon Jan 14 00:58:37 2019 @@ -28,10 +28,6 @@ public class JULTest extends LogTestHelp @Test public void test() { - - // In standard deployment mode you need to install jul-to-slf4j bridge - org.slf4j.bridge.SLF4JBridgeHandler.install(); - long time = System.nanoTime(); Logger logger = Logger.getLogger(getClass().getName()); if (logger.isLoggable(Level.INFO)) { Modified: felix/trunk/logback/itests/standard-log4j1/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j1/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-log4j1/itest.bndrun (original) +++ felix/trunk/logback/itests/standard-log4j1/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -12,14 +12,9 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - slf4j.api;version='[1.7.25,1.7.26)',\ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - log4j.over.slf4j;version='[1.7.25,1.7.26)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.standard.log4j1;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ + ch.qos.logback.core;version='[1.2.3,1.2.4)',\ + log4j.over.slf4j;version='[1.7.25,1.7.26)',\ + org.apache.felix.logback.itests.standard.log4j1;version='[1.0.0,1.0.1)',\ + slf4j.api;version='[1.7.25,1.7.26)' Modified: felix/trunk/logback/itests/standard-log4j1/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j1/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-log4j1/logback.xml (original) +++ felix/trunk/logback/itests/standard-log4j1/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/standard-log4j1/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j1/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-log4j1/pom.xml (original) +++ felix/trunk/logback/itests/standard-log4j1/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.standard.log4j1</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/standard-log4j2/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j2/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-log4j2/itest.bndrun (original) +++ felix/trunk/logback/itests/standard-log4j2/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -13,15 +13,10 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - slf4j.api;version='[1.7.25,1.7.26)',\ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - org.apache.logging.log4j.to-slf4j;version='[2.11.0,2.11.1)',\ - org.apache.logging.log4j.api;version='[2.11.0,2.11.1)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.standard.log4j2;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ + ch.qos.logback.core;version='[1.2.3,1.2.4)',\ + org.apache.felix.logback.itests.standard.log4j2;version='[1.0.0,1.0.1)',\ + org.apache.logging.log4j.api;version='[2.11.1,2.11.2)',\ + org.apache.logging.log4j.to-slf4j;version='[2.11.1,2.11.2)',\ + slf4j.api;version='[1.7.25,1.7.26)' Modified: felix/trunk/logback/itests/standard-log4j2/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j2/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-log4j2/logback.xml (original) +++ felix/trunk/logback/itests/standard-log4j2/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/standard-log4j2/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j2/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-log4j2/pom.xml (original) +++ felix/trunk/logback/itests/standard-log4j2/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.standard.log4j2</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/standard-log4j2/src/main/java/org/apache/felix/logback/test/Activator.java URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j2/src/main/java/org/apache/felix/logback/test/Activator.java?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-log4j2/src/main/java/org/apache/felix/logback/test/Activator.java (original) +++ felix/trunk/logback/itests/standard-log4j2/src/main/java/org/apache/felix/logback/test/Activator.java Mon Jan 14 00:58:37 2019 @@ -22,26 +22,21 @@ import java.util.Dictionary; import java.util.Hashtable; import org.apache.logging.log4j.spi.Provider; -import org.apache.logging.slf4j.MDCContextMap; -import org.apache.logging.slf4j.SLF4JLoggerContextFactory; +import org.apache.logging.slf4j.SLF4JProvider; +import org.osgi.annotation.bundle.Header; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; +@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}") public class Activator implements BundleActivator { @Override public void start(BundleContext bundleContext) throws Exception { - Provider slf4jProvider = new Provider( - 15, "2.6.0", SLF4JLoggerContextFactory.class, MDCContextMap.class); - + Provider slf4jProvider = new SLF4JProvider(); Dictionary<String, Object> properties = new Hashtable<>(); - - // The following value is pulled from here [1] but I think it's a typo [2] - // [1] https://git-wip-us.apache.org/repos/asf?p=logging-log4j2.git;a=blob;f=log4j-api/src/main/java/org/apache/logging/log4j/util/Activator.java;h=c7910e505e18b9de339c7671641d04aceb2d9b37;hb=HEAD#l103 - // [2] https://issues.apache.org/jira/browse/LOG4J2-2343 - properties.put("APIVersion", "2.60"); - + properties.put("APIVersion", slf4jProvider.getVersions()); serviceRegistration = bundleContext.registerService(Provider.class, slf4jProvider, properties); } Modified: felix/trunk/logback/itests/standard-slf4j/itest.bndrun URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-slf4j/itest.bndrun?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-slf4j/itest.bndrun (original) +++ felix/trunk/logback/itests/standard-slf4j/itest.bndrun Mon Jan 14 00:58:37 2019 @@ -1,4 +1,4 @@ --standalone: target/index.xml +-standalone: true -runee: JavaSE-1.8 -resolve.effective: resolve, active @@ -12,13 +12,8 @@ logback.configurationFile=file:${.}/logback.xml -runbundles: \ - slf4j.api;version='[1.7.25,1.7.26)',\ - ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ - ch.qos.logback.core;version='[1.2.3,1.2.4)',\ - osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ - osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\ - org.apache.felix.logback.itests.standard.slf4j;version='[1.0.0,1.0.1)',\ - org.osgi.service.log;version='[1.4.0,1.4.1)',\ - org.osgi.util.function;version='[1.1.0,1.1.1)',\ - org.osgi.util.promise;version='[1.1.0,1.1.1)',\ - org.osgi.util.pushstream;version='[1.0.0,1.0.1)' + biz.aQute.junit;version='[4.1.0,4.1.1)',\ + ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ + ch.qos.logback.core;version='[1.2.3,1.2.4)',\ + org.apache.felix.logback.itests.standard.slf4j;version='[1.0.0,1.0.1)',\ + slf4j.api;version='[1.7.25,1.7.26)' Modified: felix/trunk/logback/itests/standard-slf4j/logback.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-slf4j/logback.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-slf4j/logback.xml (original) +++ felix/trunk/logback/itests/standard-slf4j/logback.xml Mon Jan 14 00:58:37 2019 @@ -26,12 +26,7 @@ <pattern>%-5level %logger{1000}:%line - %msg%n</pattern> </encoder> </appender> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> - <file>target/test.log</file> - <encoder> - <pattern>%level|%logger{1000}|%msg%n</pattern> - </encoder> - </appender> + <appender name="FILE" class="ch.qos.logback.core.read.ListAppender" /> <logger name="Events.Bundle" level="ERROR"/> <logger name="Events.Framework" level="ERROR"/> Modified: felix/trunk/logback/itests/standard-slf4j/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-slf4j/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-slf4j/pom.xml (original) +++ felix/trunk/logback/itests/standard-slf4j/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,35 +19,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.itests.parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> + <relativePath>../itest-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.standard.slf4j</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.helper</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-resolver-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-testing-maven-plugin</artifactId> - </plugin> - </plugins> - </build> </project> Modified: felix/trunk/logback/itests/test-helper/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/test-helper/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/test-helper/pom.xml (original) +++ felix/trunk/logback/itests/test-helper/pom.xml Mon Jan 14 00:58:37 2019 @@ -19,7 +19,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <parent> <groupId>org.apache.felix</groupId> - <artifactId>org.apache.felix.logback.itests.reactor</artifactId> + <artifactId>org.apache.felix.logback.reactor</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -28,4 +28,53 @@ <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> <artifactId>org.apache.felix.logback.itests.helper</artifactId> + + <properties> + <animal.sniffer.skip>true</animal.sniffer.skip> + <maven.deploy.skip>true</maven.deploy.skip> + <maven.javadoc.skip>true</maven.javadoc.skip> + <maven.site.skip>true</maven.site.skip> + <maven.source.skip>true</maven.source.skip> + </properties> + + <dependencies> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.junit</artifactId> + <version>${bnd.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.3</version> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.log</artifactId> + <version>1.4.0</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <groupId>biz.aQute.bnd</groupId> + <artifactId>bnd-maven-plugin</artifactId> + </plugin> + </plugins> + </build> </project> Modified: felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java (original) +++ felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/LogTestHelper.java Mon Jan 14 00:58:37 2019 @@ -18,27 +18,21 @@ */ package org.apache.felix.logback.test.helper; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; import java.util.Iterator; -import java.util.Scanner; import org.junit.BeforeClass; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceReference; import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.encoder.PatternLayoutEncoder; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; -import ch.qos.logback.core.FileAppender; -import ch.qos.logback.core.recovery.ResilientFileOutputStream; +import ch.qos.logback.core.read.ListAppender; import junit.framework.AssertionFailedError; public class LogTestHelper { - protected static FileAppender<ILoggingEvent> fileAppender; + protected static ListAppender<ILoggingEvent> listAppender; + protected static PatternLayoutEncoder encoder; @BeforeClass public static void before() throws Exception { @@ -48,11 +42,16 @@ public class LogTestHelper { for (Iterator<Appender<ILoggingEvent>> index = logger.iteratorForAppenders(); index.hasNext();) { Appender<ILoggingEvent> appender = index.next(); - if (appender instanceof FileAppender) { - fileAppender = (FileAppender<ILoggingEvent>)appender; + if (appender instanceof ListAppender) { + listAppender = (ListAppender<ILoggingEvent>)appender; } } } + + encoder = new PatternLayoutEncoder(); + encoder.setPattern("%level|%logger{1000}|%msg"); + encoder.setContext(context); + encoder.start(); } protected void assertLog(String level, String name, long time) { @@ -60,41 +59,21 @@ public class LogTestHelper { } protected void assertLog(String record) { - boolean found = false; - - ResilientFileOutputStream rfos = (ResilientFileOutputStream)fileAppender.getOutputStream(); - rfos.flush(); try { - rfos.getChannel().force(true); - } catch (IOException e1) { - e1.printStackTrace(); - } - File logFile = rfos.getFile(); - - try (Scanner sc = new Scanner(logFile)) { - while (sc.hasNextLine()) { - String nextLine = sc.nextLine(); - - if (nextLine.equals(record)) { - found = true; - } - } + // we need to make sure we wait for async logging internals to cool down + Thread.sleep(10); } - catch (FileNotFoundException e) { - e.printStackTrace(); + catch (InterruptedException e) { } - if (!found) { + if ((listAppender.list == null) || listAppender.list.isEmpty() || + !listAppender.list.stream().anyMatch(r -> { + String lr = new String(encoder.encode(r)); + return lr.equals(record); + })) { + throw new AssertionFailedError("Log record not found: " + record); } } - protected static org.osgi.service.log.Logger getLogger(Class<?> clazz) { - BundleContext bundleContext = FrameworkUtil.getBundle(clazz).getBundleContext(); - ServiceReference<org.osgi.service.log.LoggerFactory> serviceReference = - bundleContext.getServiceReference(org.osgi.service.log.LoggerFactory.class); - org.osgi.service.log.LoggerFactory loggerFactory = bundleContext.getService(serviceReference); - return loggerFactory.getLogger(clazz); - } - } Copied: felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/ls/LogServiceHelper.java (from r1851217, felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java) URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/ls/LogServiceHelper.java?p2=felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/ls/LogServiceHelper.java&p1=felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java&r1=1851217&r2=1851218&rev=1851218&view=diff ============================================================================== --- felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java (original) +++ felix/trunk/logback/itests/test-helper/src/main/java/org/apache/felix/logback/test/helper/ls/LogServiceHelper.java Mon Jan 14 00:58:37 2019 @@ -16,28 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.logback.test; +package org.apache.felix.logback.test.helper.ls; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.felix.logback.test.helper.LogTestHelper; -import org.junit.Test; - -public class JULTest extends LogTestHelper { - - @Test - public void test() { - - // In standard deployment mode you need to install jul-to-slf4j bridge - org.slf4j.bridge.SLF4JBridgeHandler.install(); - - long time = System.nanoTime(); - Logger logger = Logger.getLogger(getClass().getName()); - if (logger.isLoggable(Level.INFO)) { - logger.info(time + ""); - } - assertLog("INFO", getClass().getName(), time); +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.ServiceReference; + +public class LogServiceHelper { + + public static org.osgi.service.log.Logger getLogger(Class<?> clazz) { + BundleContext bundleContext = FrameworkUtil.getBundle(clazz).getBundleContext(); + ServiceReference<org.osgi.service.log.LoggerFactory> serviceReference = + bundleContext.getServiceReference(org.osgi.service.log.LoggerFactory.class); + org.osgi.service.log.LoggerFactory loggerFactory = bundleContext.getService(serviceReference); + return loggerFactory.getLogger(clazz); } } Modified: felix/trunk/logback/logback/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/logback/logback/pom.xml?rev=1851218&r1=1851217&r2=1851218&view=diff ============================================================================== --- felix/trunk/logback/logback/pom.xml (original) +++ felix/trunk/logback/logback/pom.xml Mon Jan 14 00:58:37 2019 @@ -116,6 +116,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>rat-maven-plugin</artifactId> + <version>0.12</version> <configuration> <excludeSubProjects>false</excludeSubProjects> <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
