You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2018/05/28 21:01:10 UTC
svn commit: r1832420 [2/3] - in /felix/trunk: logback/ logback/itests/
logback/itests/immediate-equinox-logservice/
logback/itests/immediate-equinox-logservice/src/
logback/itests/immediate-equinox-logservice/src/main/
logback/itests/immediate-equinox-...
Added: felix/trunk/logback/itests/immediate-log4j2/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j2/itest.bndrun?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-log4j2/itest.bndrun (added)
+++ felix/trunk/logback/itests/immediate-log4j2/itest.bndrun Mon May 28 21:01:08 2018
@@ -0,0 +1,34 @@
+-standalone: target/index.xml
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runfw: org.apache.felix.framework
+
+-runrequires:\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.log4j2)'
+
+-runpath: \
+ 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.api;version='[2.11.0,2.11.1)',\
+ org.apache.logging.log4j.to-slf4j;version='[2.11.0,2.11.1)',\
+ slf4j.api;version='[1.7.25,1.7.26)'
+
+-runsystempackages: \
+ org.apache.logging.log4j;version=2.11.0,\
+ org.slf4j;version=1.7.25,\
+ org.slf4j.helpers;version=1.7.25,\
+ org.slf4j.spi;version=1.7.25
+
+-runproperties: \
+ logback.configurationFile=file:${.}/logback.xml,\
+ org.jboss.logging.provider=slf4j
+
+-runbundles: \
+ 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.immediate.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)'
Added: felix/trunk/logback/itests/immediate-log4j2/jul-logging.properties
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j2/jul-logging.properties?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-log4j2/jul-logging.properties (added)
+++ felix/trunk/logback/itests/immediate-log4j2/jul-logging.properties Mon May 28 21:01:08 2018
@@ -0,0 +1,13 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+handlers = org.slf4j.bridge.SLF4JBridgeHandler
\ No newline at end of file
Added: felix/trunk/logback/itests/immediate-log4j2/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j2/logback.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-log4j2/logback.xml (added)
+++ felix/trunk/logback/itests/immediate-log4j2/logback.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+ <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
+ <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>
+
+ <logger name="Events.Bundle" level="ERROR"/>
+ <logger name="Events.Framework" level="ERROR"/>
+ <logger name="Events.Service" level="ERROR"/>
+ <logger name="LogService" level="ERROR"/>
+
+ <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.logback.itests" level="OFF"/>
+
+ <logger name="org.apache.felix.logback.test" level="DEBUG" />
+
+ <root level="ERROR">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
Added: felix/trunk/logback/itests/immediate-log4j2/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j2/pom.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-log4j2/pom.xml (added)
+++ felix/trunk/logback/itests/immediate-log4j2/pom.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <artifactId>org.apache.felix.logback.itests.immediate.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>
Added: felix/trunk/logback/itests/immediate-log4j2/src/main/java/org/apache/felix/logback/test/Log4j2Test.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-log4j2/src/main/java/org/apache/felix/logback/test/Log4j2Test.java?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-log4j2/src/main/java/org/apache/felix/logback/test/Log4j2Test.java (added)
+++ felix/trunk/logback/itests/immediate-log4j2/src/main/java/org/apache/felix/logback/test/Log4j2Test.java Mon May 28 21:01:08 2018
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.logback.test;
+
+import org.apache.felix.logback.test.helper.LogTestHelper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class Log4j2Test extends LogTestHelper {
+
+ @Test
+ public void test() {
+ long time = System.nanoTime();
+ Logger logger = LogManager.getLogger(getClass());
+ if (logger.isInfoEnabled()) {
+ logger.info(time + "");
+ }
+ assertLog("INFO", getClass().getName(), time);
+ }
+
+}
Added: felix/trunk/logback/itests/immediate-slf4j/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-slf4j/bnd.bnd?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-slf4j/bnd.bnd (added)
+++ felix/trunk/logback/itests/immediate-slf4j/bnd.bnd Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Export-Package: ${p}.*
+Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
+-conditionalpackage: org.apache.felix.logback.test.helper
+
+##
+## All of remainder is to make bnd's `-make` function work in our maven project.
+##
+
+# We need to define a root package so we can split the classpath contents into many `sub-bundles`.
+p = org.apache.felix.logbackend.test
+
+# We need to tell bnd's make function what the classpath is for making `sub-bundles`.
+-classpath: target/classes
+
+# This is the instruction containing the make recipe and the recipe dir pattern for finding the bnd files.
+-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
+
+# Finally, include the `-make'd` jars in the test bundle. This also happens to trigger the make function
+# so don't forget to list new jars here as new bnd files are added into the recipe dir.
+#-includeresource:\
+# tb1.jar,\
+
+# Don't forget that we had to coax the `maven-jar-plugin` NOT to include the `sub-bundle` packages in
+# the root bundle:
+#
+# <artifactId>maven-jar-plugin</artifactId>
+# <configuration>
+# <includes>
+# <include>META-INF/*</include>
+# <include>OSGI-INF/*</include>
+# <include>OSGI-OPT/*</include>
+# <!-- List all the packages we want to keep in the root bundle. -->
+# <include>org/apache/aries/cdi/test/cases/*</include>
+# <include>org/apache/aries/cdi/test/components/*</include>
+# <!-- Make sure to include all the sub-bundles we created. -->
+# <include>*.jar</include>
+# </includes>
+# </configuration>
Added: felix/trunk/logback/itests/immediate-slf4j/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-slf4j/itest.bndrun?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-slf4j/itest.bndrun (added)
+++ felix/trunk/logback/itests/immediate-slf4j/itest.bndrun Mon May 28 21:01:08 2018
@@ -0,0 +1,30 @@
+-standalone: target/index.xml
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runfw: org.apache.felix.framework
+
+-runrequires:\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.immediate.slf4j)'
+
+-runpath: \
+ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+ slf4j.api;version='[1.7.25,1.7.26)'
+
+-runsystempackages: \
+ org.slf4j;version=1.7.25,\
+ org.slf4j.helpers;version=1.7.25,\
+ org.slf4j.spi;version=1.7.25
+
+-runproperties: \
+ logback.configurationFile=file:${.}/logback.xml
+
+-runbundles: \
+ 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.immediate.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)'
Added: felix/trunk/logback/itests/immediate-slf4j/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-slf4j/logback.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-slf4j/logback.xml (added)
+++ felix/trunk/logback/itests/immediate-slf4j/logback.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+ <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
+ <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>
+
+ <logger name="Events.Bundle" level="ERROR"/>
+ <logger name="Events.Framework" level="ERROR"/>
+ <logger name="Events.Service" level="ERROR"/>
+ <logger name="LogService" level="ERROR"/>
+
+ <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.logback.itests" level="OFF"/>
+
+ <logger name="org.apache.felix.logback.test" level="DEBUG" />
+
+ <root level="ERROR">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
Added: felix/trunk/logback/itests/immediate-slf4j/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-slf4j/pom.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-slf4j/pom.xml (added)
+++ felix/trunk/logback/itests/immediate-slf4j/pom.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <artifactId>org.apache.felix.logback.itests.immediate.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>
Added: felix/trunk/logback/itests/immediate-slf4j/src/main/java/org/apache/felix/logback/test/SLF4JTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/immediate-slf4j/src/main/java/org/apache/felix/logback/test/SLF4JTest.java?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/immediate-slf4j/src/main/java/org/apache/felix/logback/test/SLF4JTest.java (added)
+++ felix/trunk/logback/itests/immediate-slf4j/src/main/java/org/apache/felix/logback/test/SLF4JTest.java Mon May 28 21:01:08 2018
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.logback.test;
+
+import org.apache.felix.logback.test.helper.LogTestHelper;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SLF4JTest extends LogTestHelper {
+
+ @Test
+ public void test() {
+ long time = System.nanoTime();
+ Logger logger = LoggerFactory.getLogger(getClass());
+ if (logger.isInfoEnabled()) {
+ logger.info(time + "");
+ }
+ assertLog("INFO", getClass().getName(), time);
+ }
+
+}
Added: felix/trunk/logback/itests/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/pom.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/pom.xml (added)
+++ felix/trunk/logback/itests/pom.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,226 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.logback.reactor</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <name>Apache Felix Logback ITests Reactor</name>
+ <artifactId>org.apache.felix.logback.itests.reactor</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/logback/itests</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/felix/trunk/logback/itests</developerConnection>
+ <url>http://svn.apache.org/viewvc/felix/trunk/logback/itests/</url>
+ </scm>
+
+ <properties>
+ <animal.sniffer.skip>true</animal.sniffer.skip>
+ <maven.deploy.skip>true</maven.deploy.skip>
+ <maven.install.skip>true</maven.install.skip>
+ </properties>
+
+ <modules>
+ <module>test-helper</module>
+ <module>immediate-equinox-logservice</module>
+ <module>immediate-felix-logservice</module>
+ <module>immediate-jbl</module>
+ <module>immediate-jcl</module>
+ <module>immediate-jul</module>
+ <module>immediate-log4j1</module>
+ <module>immediate-log4j2</module>
+ <module>immediate-slf4j</module>
+ <module>standard-equinox-logservice</module>
+ <module>standard-felix-logservice</module>
+ <module>standard-jbl</module>
+ <module>standard-jcl</module>
+ <module>standard-jul</module>
+ <module>standard-log4j1</module>
+ <module>standard-log4j2</module>
+ <module>standard-slf4j</module>
+ </modules>
+
+ <dependencies>
+ <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>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.function</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.promise</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.pushstream</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.logback</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>5.6.10</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.platform</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.13.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.junit.wrapper</artifactId>
+ <version>4.12.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.enroute.hamcrest.wrapper</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>1.7.25</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.3.2.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>1.7.25</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>2.11.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>2.11.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>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>META-INF/*</include>
+ <include>OSGI-OPT/*</include>
+ <include>org/apache/felix/logback/test/*</include>
+ <include>org/apache/felix/logback/test/helper/*</include>
+ <include>*.jar</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-indexer-maven-plugin</artifactId>
+ <configuration>
+ <includeJar>true</includeJar>
+ <localURLs>REQUIRED</localURLs>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <bndruns>
+ <bndrun>itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-testing-maven-plugin</artifactId>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <resolve>false</resolve>
+ <bndruns>
+ <bndrun>itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Added: felix/trunk/logback/itests/standard-equinox-logservice/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/bnd.bnd?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-equinox-logservice/bnd.bnd (added)
+++ felix/trunk/logback/itests/standard-equinox-logservice/bnd.bnd Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Export-Package: ${p}.*
+Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
+-conditionalpackage: org.apache.felix.logback.test.helper
+
+##
+## All of remainder is to make bnd's `-make` function work in our maven project.
+##
+
+# We need to define a root package so we can split the classpath contents into many `sub-bundles`.
+p = org.apache.felix.logbackend.test
+
+# We need to tell bnd's make function what the classpath is for making `sub-bundles`.
+-classpath: target/classes
+
+# This is the instruction containing the make recipe and the recipe dir pattern for finding the bnd files.
+-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
+
+# Finally, include the `-make'd` jars in the test bundle. This also happens to trigger the make function
+# so don't forget to list new jars here as new bnd files are added into the recipe dir.
+#-includeresource:\
+# tb1.jar,\
+
+# Don't forget that we had to coax the `maven-jar-plugin` NOT to include the `sub-bundle` packages in
+# the root bundle:
+#
+# <artifactId>maven-jar-plugin</artifactId>
+# <configuration>
+# <includes>
+# <include>META-INF/*</include>
+# <include>OSGI-INF/*</include>
+# <include>OSGI-OPT/*</include>
+# <!-- List all the packages we want to keep in the root bundle. -->
+# <include>org/apache/aries/cdi/test/cases/*</include>
+# <include>org/apache/aries/cdi/test/components/*</include>
+# <!-- Make sure to include all the sub-bundles we created. -->
+# <include>*.jar</include>
+# </includes>
+# </configuration>
Added: felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun (added)
+++ felix/trunk/logback/itests/standard-equinox-logservice/itest.bndrun Mon May 28 21:01:08 2018
@@ -0,0 +1,23 @@
+-standalone: target/index.xml
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runfw: org.eclipse.osgi
+
+-runrequires:\
+ osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.equinox.logservice)'
+
+-runproperties: \
+ eclipse.log.enabled=false,\
+ logback.configurationFile=file:${.}/logback.xml
+
+-runbundles: \
+ org.apache.felix.logback;version='[1.0.0,1.0.1)',\
+ 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.equinox.logservice;version='[1.0.0,1.0.1)'
Added: felix/trunk/logback/itests/standard-equinox-logservice/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/logback.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-equinox-logservice/logback.xml (added)
+++ felix/trunk/logback/itests/standard-equinox-logservice/logback.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,45 @@
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+ <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
+ <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>
+
+ <logger name="Events.Service.org.apache.felix.logback.itests" level="DEBUG"/>
+ <logger name="LogService.org.apache.felix.logback.itests" level="DEBUG"/>
+
+ <logger name="org.apache.felix.logback.test" level="DEBUG" />
+
+ <root level="ERROR">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
Added: felix/trunk/logback/itests/standard-equinox-logservice/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/pom.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-equinox-logservice/pom.xml (added)
+++ felix/trunk/logback/itests/standard-equinox-logservice/pom.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../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.equinox.logservice</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>
Added: felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java (added)
+++ felix/trunk/logback/itests/standard-equinox-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java Mon May 28 21:01:08 2018
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.logback.test;
+
+import org.apache.felix.logback.test.helper.LogTestHelper;
+import org.junit.Test;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.log.Logger;
+
+public class LogServiceTest extends LogTestHelper {
+
+ @Test
+ public void test() {
+ long time = System.nanoTime();
+ Logger logger = getLogger(getClass());
+ if (logger.isInfoEnabled()) {
+ logger.info(time + "");
+ }
+ assertLog("INFO", getClass().getName(), time);
+ }
+
+ @Test
+ public void service() {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ ServiceRegistration<Integer> registration = bundleContext.registerService(Integer.class, new Integer(25), null);
+
+ ServiceReference<Integer> reference = registration.getReference();
+ String refString = reference.toString();
+
+ try {
+ assertLog("INFO|Events.Service.org.apache.felix.logback.itests.standard.equinox.logservice|ServiceEvent REGISTERED " + refString);
+ }
+ finally {
+ registration.unregister();
+ assertLog("INFO|Events.Service.org.apache.felix.logback.itests.standard.equinox.logservice|ServiceEvent UNREGISTERING " + refString);
+ }
+ }
+
+}
Added: felix/trunk/logback/itests/standard-felix-logservice/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/bnd.bnd?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/bnd.bnd (added)
+++ felix/trunk/logback/itests/standard-felix-logservice/bnd.bnd Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Export-Package: ${p}.*
+Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
+-conditionalpackage: org.apache.felix.logback.test.helper
+
+##
+## All of remainder is to make bnd's `-make` function work in our maven project.
+##
+
+# We need to define a root package so we can split the classpath contents into many `sub-bundles`.
+p = org.apache.felix.logbackend.test
+
+# We need to tell bnd's make function what the classpath is for making `sub-bundles`.
+-classpath: target/classes
+
+# This is the instruction containing the make recipe and the recipe dir pattern for finding the bnd files.
+-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
+
+# Finally, include the `-make'd` jars in the test bundle. This also happens to trigger the make function
+# so don't forget to list new jars here as new bnd files are added into the recipe dir.
+#-includeresource:\
+# tb1.jar,\
+
+# Don't forget that we had to coax the `maven-jar-plugin` NOT to include the `sub-bundle` packages in
+# the root bundle:
+#
+# <artifactId>maven-jar-plugin</artifactId>
+# <configuration>
+# <includes>
+# <include>META-INF/*</include>
+# <include>OSGI-INF/*</include>
+# <include>OSGI-OPT/*</include>
+# <!-- List all the packages we want to keep in the root bundle. -->
+# <include>org/apache/aries/cdi/test/cases/*</include>
+# <include>org/apache/aries/cdi/test/components/*</include>
+# <!-- Make sure to include all the sub-bundles we created. -->
+# <include>*.jar</include>
+# </includes>
+# </configuration>
Added: felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun (added)
+++ felix/trunk/logback/itests/standard-felix-logservice/itest.bndrun Mon May 28 21:01:08 2018
@@ -0,0 +1,30 @@
+-standalone: target/index.xml
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runfw: org.apache.felix.framework
+
+-runblacklist: osgi.identity;filter:='(osgi.identity=org.eclipse.osgi)'
+
+-runrequires:\
+ 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.itests.standard.felix.logservice)'
+
+# osgi.identity;filter:='(osgi.identity=org.apache.felix.logback)',\
+
+-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)',\
+ org.apache.felix.logback.itests.standard.felix.logservice;version='[1.0.0,1.0.1)',\
+ org.apache.felix.log;version='[1.1.0,1.1.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)'
Added: felix/trunk/logback/itests/standard-felix-logservice/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/logback.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/logback.xml (added)
+++ felix/trunk/logback/itests/standard-felix-logservice/logback.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+ <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
+ <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>
+
+ <logger name="Events.Bundle" level="ERROR"/>
+ <logger name="Events.Framework" level="ERROR"/>
+ <logger name="Events.Service" level="ERROR"/>
+ <logger name="LogService" level="ERROR"/>
+
+ <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.logback.itests" level="OFF"/>
+
+ <logger name="org.apache.felix.logback.test" level="DEBUG" />
+
+ <root level="ERROR">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
Added: felix/trunk/logback/itests/standard-felix-logservice/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/pom.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/pom.xml (added)
+++ felix/trunk/logback/itests/standard-felix-logservice/pom.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../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.felix.logservice</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>
Added: felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java (added)
+++ felix/trunk/logback/itests/standard-felix-logservice/src/main/java/org/apache/felix/logback/test/LogServiceTest.java Mon May 28 21:01:08 2018
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.logback.test;
+
+import org.apache.felix.logback.test.helper.LogTestHelper;
+import org.junit.Test;
+// import org.slf4j.Logger;
+// import org.slf4j.LoggerFactory;
+
+public class LogServiceTest extends LogTestHelper {
+
+ @Test
+ public void test() {
+ // long time = System.nanoTime();
+ // Logger logger = LoggerFactory.getLogger(getClass());
+ // if (logger.isInfoEnabled()) {
+ // logger.info(time + "");
+ // }
+ // assertLog("INFO", getClass().getName(), time);
+ }
+
+}
Added: felix/trunk/logback/itests/standard-jbl/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jbl/bnd.bnd?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jbl/bnd.bnd (added)
+++ felix/trunk/logback/itests/standard-jbl/bnd.bnd Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Export-Package: ${p}.*
+Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
+-conditionalpackage: org.apache.felix.logback.test.helper
+
+##
+## All of remainder is to make bnd's `-make` function work in our maven project.
+##
+
+# We need to define a root package so we can split the classpath contents into many `sub-bundles`.
+p = org.apache.felix.logbackend.test
+
+# We need to tell bnd's make function what the classpath is for making `sub-bundles`.
+-classpath: target/classes
+
+# This is the instruction containing the make recipe and the recipe dir pattern for finding the bnd files.
+-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
+
+# Finally, include the `-make'd` jars in the test bundle. This also happens to trigger the make function
+# so don't forget to list new jars here as new bnd files are added into the recipe dir.
+#-includeresource:\
+# tb1.jar,\
+
+# Don't forget that we had to coax the `maven-jar-plugin` NOT to include the `sub-bundle` packages in
+# the root bundle:
+#
+# <artifactId>maven-jar-plugin</artifactId>
+# <configuration>
+# <includes>
+# <include>META-INF/*</include>
+# <include>OSGI-INF/*</include>
+# <include>OSGI-OPT/*</include>
+# <!-- List all the packages we want to keep in the root bundle. -->
+# <include>org/apache/aries/cdi/test/cases/*</include>
+# <include>org/apache/aries/cdi/test/components/*</include>
+# <!-- Make sure to include all the sub-bundles we created. -->
+# <include>*.jar</include>
+# </includes>
+# </configuration>
Added: felix/trunk/logback/itests/standard-jbl/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jbl/itest.bndrun?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jbl/itest.bndrun (added)
+++ felix/trunk/logback/itests/standard-jbl/itest.bndrun Mon May 28 21:01:08 2018
@@ -0,0 +1,26 @@
+-standalone: target/index.xml
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runfw: org.apache.felix.framework
+
+-runrequires:\
+ osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.jbl)'
+
+-runproperties: \
+ logback.configurationFile=file:${.}/logback.xml,\
+ org.jboss.logging.provider=slf4j
+
+-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.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
+ 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.jbl;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)'
Added: felix/trunk/logback/itests/standard-jbl/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jbl/logback.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jbl/logback.xml (added)
+++ felix/trunk/logback/itests/standard-jbl/logback.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+ <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
+ <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>
+
+ <logger name="Events.Bundle" level="ERROR"/>
+ <logger name="Events.Framework" level="ERROR"/>
+ <logger name="Events.Service" level="ERROR"/>
+ <logger name="LogService" level="ERROR"/>
+
+ <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.logback.itests" level="OFF"/>
+
+ <logger name="org.apache.felix.logback.test" level="DEBUG" />
+
+ <root level="ERROR">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
Added: felix/trunk/logback/itests/standard-jbl/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jbl/pom.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jbl/pom.xml (added)
+++ felix/trunk/logback/itests/standard-jbl/pom.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../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.jbl</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>
Added: felix/trunk/logback/itests/standard-jbl/src/main/java/org/apache/felix/logback/test/JBLTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jbl/src/main/java/org/apache/felix/logback/test/JBLTest.java?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jbl/src/main/java/org/apache/felix/logback/test/JBLTest.java (added)
+++ felix/trunk/logback/itests/standard-jbl/src/main/java/org/apache/felix/logback/test/JBLTest.java Mon May 28 21:01:08 2018
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.logback.test;
+
+import org.apache.felix.logback.test.helper.LogTestHelper;
+import org.jboss.logging.Logger;
+import org.junit.Test;
+
+public class JBLTest extends LogTestHelper {
+
+ @Test
+ public void test() {
+ long time = System.nanoTime();
+ Logger logger = Logger.getLogger(getClass());
+ if (logger.isInfoEnabled()) {
+ logger.info(time + "");
+ }
+ assertLog("INFO", getClass().getName(), time);
+ }
+
+}
Added: felix/trunk/logback/itests/standard-jcl/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jcl/bnd.bnd?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jcl/bnd.bnd (added)
+++ felix/trunk/logback/itests/standard-jcl/bnd.bnd Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Export-Package: ${p}.*
+Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
+-conditionalpackage: org.apache.felix.logback.test.helper
+
+##
+## All of remainder is to make bnd's `-make` function work in our maven project.
+##
+
+# We need to define a root package so we can split the classpath contents into many `sub-bundles`.
+p = org.apache.felix.logbackend.test
+
+# We need to tell bnd's make function what the classpath is for making `sub-bundles`.
+-classpath: target/classes
+
+# This is the instruction containing the make recipe and the recipe dir pattern for finding the bnd files.
+-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
+
+# Finally, include the `-make'd` jars in the test bundle. This also happens to trigger the make function
+# so don't forget to list new jars here as new bnd files are added into the recipe dir.
+#-includeresource:\
+# tb1.jar,\
+
+# Don't forget that we had to coax the `maven-jar-plugin` NOT to include the `sub-bundle` packages in
+# the root bundle:
+#
+# <artifactId>maven-jar-plugin</artifactId>
+# <configuration>
+# <includes>
+# <include>META-INF/*</include>
+# <include>OSGI-INF/*</include>
+# <include>OSGI-OPT/*</include>
+# <!-- List all the packages we want to keep in the root bundle. -->
+# <include>org/apache/aries/cdi/test/cases/*</include>
+# <include>org/apache/aries/cdi/test/components/*</include>
+# <!-- Make sure to include all the sub-bundles we created. -->
+# <include>*.jar</include>
+# </includes>
+# </configuration>
Added: felix/trunk/logback/itests/standard-jcl/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jcl/itest.bndrun?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jcl/itest.bndrun (added)
+++ felix/trunk/logback/itests/standard-jcl/itest.bndrun Mon May 28 21:01:08 2018
@@ -0,0 +1,27 @@
+-standalone: target/index.xml
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runfw: org.apache.felix.framework
+
+-runrequires:\
+ osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\
+ osgi.identity;filter:='(osgi.identity=log4j.over.slf4j)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.jcl)'
+
+-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)',\
+ log4j.over.slf4j;version='[1.7.25,1.7.26)',\
+ org.apache.commons.logging;version='[1.2.0,1.2.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.jcl;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)'
Added: felix/trunk/logback/itests/standard-jcl/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jcl/logback.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jcl/logback.xml (added)
+++ felix/trunk/logback/itests/standard-jcl/logback.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+ <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
+ <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>
+
+ <logger name="Events.Bundle" level="ERROR"/>
+ <logger name="Events.Framework" level="ERROR"/>
+ <logger name="Events.Service" level="ERROR"/>
+ <logger name="LogService" level="ERROR"/>
+
+ <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.logback.itests" level="OFF"/>
+
+ <logger name="org.apache.felix.logback.test" level="DEBUG" />
+
+ <root level="ERROR">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
Added: felix/trunk/logback/itests/standard-jcl/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jcl/pom.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jcl/pom.xml (added)
+++ felix/trunk/logback/itests/standard-jcl/pom.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../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>
Added: felix/trunk/logback/itests/standard-jcl/src/main/java/org/apache/felix/logback/test/JCLTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jcl/src/main/java/org/apache/felix/logback/test/JCLTest.java?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jcl/src/main/java/org/apache/felix/logback/test/JCLTest.java (added)
+++ felix/trunk/logback/itests/standard-jcl/src/main/java/org/apache/felix/logback/test/JCLTest.java Mon May 28 21:01:08 2018
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.logback.test;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.felix.logback.test.helper.LogTestHelper;
+import org.junit.Test;
+
+public class JCLTest extends LogTestHelper {
+
+ @Test
+ public void test() {
+ long time = System.nanoTime();
+ Log logger = LogFactory.getLog(getClass());
+ if (logger.isInfoEnabled()) {
+ logger.info(time + "");
+ }
+ assertLog("INFO", getClass().getName(), time);
+ }
+
+}
Added: felix/trunk/logback/itests/standard-jul/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jul/bnd.bnd?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jul/bnd.bnd (added)
+++ felix/trunk/logback/itests/standard-jul/bnd.bnd Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Export-Package: ${p}.*
+Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
+-conditionalpackage: org.apache.felix.logback.test.helper
+
+##
+## All of remainder is to make bnd's `-make` function work in our maven project.
+##
+
+# We need to define a root package so we can split the classpath contents into many `sub-bundles`.
+p = org.apache.felix.logbackend.test
+
+# We need to tell bnd's make function what the classpath is for making `sub-bundles`.
+-classpath: target/classes
+
+# This is the instruction containing the make recipe and the recipe dir pattern for finding the bnd files.
+-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
+
+# Finally, include the `-make'd` jars in the test bundle. This also happens to trigger the make function
+# so don't forget to list new jars here as new bnd files are added into the recipe dir.
+#-includeresource:\
+# tb1.jar,\
+
+# Don't forget that we had to coax the `maven-jar-plugin` NOT to include the `sub-bundle` packages in
+# the root bundle:
+#
+# <artifactId>maven-jar-plugin</artifactId>
+# <configuration>
+# <includes>
+# <include>META-INF/*</include>
+# <include>OSGI-INF/*</include>
+# <include>OSGI-OPT/*</include>
+# <!-- List all the packages we want to keep in the root bundle. -->
+# <include>org/apache/aries/cdi/test/cases/*</include>
+# <include>org/apache/aries/cdi/test/components/*</include>
+# <!-- Make sure to include all the sub-bundles we created. -->
+# <include>*.jar</include>
+# </includes>
+# </configuration>
Added: felix/trunk/logback/itests/standard-jul/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jul/itest.bndrun?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jul/itest.bndrun (added)
+++ felix/trunk/logback/itests/standard-jul/itest.bndrun Mon May 28 21:01:08 2018
@@ -0,0 +1,26 @@
+-standalone: target/index.xml
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-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.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)'
Added: felix/trunk/logback/itests/standard-jul/logback.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jul/logback.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jul/logback.xml (added)
+++ felix/trunk/logback/itests/standard-jul/logback.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+<!--
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<configuration>
+ <!-- scan="true" scanPeriod="5 seconds" debug="true"> -->
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <!-- <pattern>%d{HH:mm:ss.SSS} [%.15thread] %-5level %logger{36}:%line - %msg%n</pattern> -->
+ <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>
+
+ <logger name="Events.Bundle" level="ERROR"/>
+ <logger name="Events.Framework" level="ERROR"/>
+ <logger name="Events.Service" level="ERROR"/>
+ <logger name="LogService" level="ERROR"/>
+
+ <logger name="Events.Service.org.apache.logback.itests" level="INFO"/>
+ <logger name="LogService.org.apache.logback.itests" level="OFF"/>
+
+ <logger name="org.apache.felix.logback.test" level="DEBUG" />
+
+ <root level="ERROR">
+ <appender-ref ref="STDOUT" />
+ <appender-ref ref="FILE" />
+ </root>
+</configuration>
Added: felix/trunk/logback/itests/standard-jul/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-jul/pom.xml?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jul/pom.xml (added)
+++ felix/trunk/logback/itests/standard-jul/pom.xml Mon May 28 21:01:08 2018
@@ -0,0 +1,53 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<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>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../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.jul</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>
Added: 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=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java (added)
+++ felix/trunk/logback/itests/standard-jul/src/main/java/org/apache/felix/logback/test/JULTest.java Mon May 28 21:01:08 2018
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.logback.test;
+
+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);
+ }
+
+}
Added: felix/trunk/logback/itests/standard-log4j1/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j1/bnd.bnd?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-log4j1/bnd.bnd (added)
+++ felix/trunk/logback/itests/standard-log4j1/bnd.bnd Mon May 28 21:01:08 2018
@@ -0,0 +1,50 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Export-Package: ${p}.*
+Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
+-conditionalpackage: org.apache.felix.logback.test.helper
+
+##
+## All of remainder is to make bnd's `-make` function work in our maven project.
+##
+
+# We need to define a root package so we can split the classpath contents into many `sub-bundles`.
+p = org.apache.felix.logbackend.test
+
+# We need to tell bnd's make function what the classpath is for making `sub-bundles`.
+-classpath: target/classes
+
+# This is the instruction containing the make recipe and the recipe dir pattern for finding the bnd files.
+-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
+
+# Finally, include the `-make'd` jars in the test bundle. This also happens to trigger the make function
+# so don't forget to list new jars here as new bnd files are added into the recipe dir.
+#-includeresource:\
+# tb1.jar,\
+
+# Don't forget that we had to coax the `maven-jar-plugin` NOT to include the `sub-bundle` packages in
+# the root bundle:
+#
+# <artifactId>maven-jar-plugin</artifactId>
+# <configuration>
+# <includes>
+# <include>META-INF/*</include>
+# <include>OSGI-INF/*</include>
+# <include>OSGI-OPT/*</include>
+# <!-- List all the packages we want to keep in the root bundle. -->
+# <include>org/apache/aries/cdi/test/cases/*</include>
+# <include>org/apache/aries/cdi/test/components/*</include>
+# <!-- Make sure to include all the sub-bundles we created. -->
+# <include>*.jar</include>
+# </includes>
+# </configuration>
Added: felix/trunk/logback/itests/standard-log4j1/itest.bndrun
URL: http://svn.apache.org/viewvc/felix/trunk/logback/itests/standard-log4j1/itest.bndrun?rev=1832420&view=auto
==============================================================================
--- felix/trunk/logback/itests/standard-log4j1/itest.bndrun (added)
+++ felix/trunk/logback/itests/standard-log4j1/itest.bndrun Mon May 28 21:01:08 2018
@@ -0,0 +1,25 @@
+-standalone: target/index.xml
+-runee: JavaSE-1.8
+-resolve.effective: resolve, active
+
+-runfw: org.apache.felix.framework
+
+-runrequires:\
+ osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.logback.itests.standard.log4j1)'
+
+-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)',\
+ 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)'