Repository: aries-jax-rs-whiteboard Updated Branches: refs/heads/master 576f7e395 -> cbd6ebd1b
[ARIES-JAXRS] simplify logging config Signed-off-by: Raymond Auge <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/cbd6ebd1 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/cbd6ebd1 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/cbd6ebd1 Branch: refs/heads/master Commit: cbd6ebd1b7e74a1dedb5ec7b003757d159272ee0 Parents: 576f7e3 Author: Raymond Auge <[email protected]> Authored: Fri Feb 24 11:22:47 2017 -0500 Committer: Raymond Auge <[email protected]> Committed: Fri Feb 24 11:44:17 2017 -0500 ---------------------------------------------------------------------- jax-rs.example/example.bndrun | 3 +- jax-rs.example/log4j.properties | 9 +++++ jax-rs.itests/itest.bndrun | 3 +- jax-rs.itests/log4j.properties | 9 +++++ jax-rs.log4j-configuration/bnd.bnd | 1 - jax-rs.log4j-configuration/pom.xml | 42 -------------------- .../src/main/resources/log4j.properties | 9 ----- pom.xml | 1 - 8 files changed, 20 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/cbd6ebd1/jax-rs.example/example.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.example/example.bndrun b/jax-rs.example/example.bndrun index de1c487..539323a 100644 --- a/jax-rs.example/example.bndrun +++ b/jax-rs.example/example.bndrun @@ -4,7 +4,6 @@ -runrequires: \ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\ - osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)',\ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\ osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' @@ -16,7 +15,6 @@ javax.ws.rs-api;version='[2.0.1,2.0.2)',\ log4j;version='[1.2.17,1.2.18)',\ org.apache.aries.jax.rs.example;version='[0.0.1,0.0.2)',\ - org.apache.aries.jax.rs.log4j-configuration;version='[0.0.1,0.0.2)',\ org.apache.aries.jax.rs.whiteboard;version='[0.0.1,0.0.2)',\ org.apache.felix.bundlerepository;version='[1.6.0,1.6.1)',\ org.apache.felix.eventadmin;version='[1.4.8,1.4.9)',\ @@ -39,6 +37,7 @@ -runee: JavaSE-1.8 -resolve.effective: resolve, active -runproperties: \ + log4j.configuration=file:${.}/log4j.properties,\ osgi.console.enable.builtin=false, \ osgi.console=, \ org.osgi.service.http.port=8080 http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/cbd6ebd1/jax-rs.example/log4j.properties ---------------------------------------------------------------------- diff --git a/jax-rs.example/log4j.properties b/jax-rs.example/log4j.properties new file mode 100644 index 0000000..a136842 --- /dev/null +++ b/jax-rs.example/log4j.properties @@ -0,0 +1,9 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=ERROR, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/cbd6ebd1/jax-rs.itests/itest.bndrun ---------------------------------------------------------------------- diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun index 5d96119..ed73734 100644 --- a/jax-rs.itests/itest.bndrun +++ b/jax-rs.itests/itest.bndrun @@ -2,7 +2,6 @@ -runrequires: \ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)',\ - osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.log4j-configuration)',\ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)',\ osgi.identity;filter:='(osgi.identity=slf4j.log4j12)' @@ -15,6 +14,7 @@ -runsystemcapabilities: ${native_capability} -runproperties: \ + log4j.configuration=file:${.}/log4j.properties,\ osgi.console.enable.builtin=false, \ osgi.console=, \ org.osgi.service.http.port=8080 @@ -26,7 +26,6 @@ javax.ws.rs-api;version='[2.0.1,2.0.2)',\ log4j;version='[1.2.17,1.2.18)',\ org.apache.aries.jax.rs.itests;version='[0.0.1,0.0.2)',\ - org.apache.aries.jax.rs.log4j-configuration;version='[0.0.1,0.0.2)',\ org.apache.cxf.cxf-core;version='[3.1.7,3.1.8)',\ org.apache.cxf.cxf-rt-transports-http;version='[3.1.7,3.1.8)',\ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.1.7,3.1.8)',\ http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/cbd6ebd1/jax-rs.itests/log4j.properties ---------------------------------------------------------------------- diff --git a/jax-rs.itests/log4j.properties b/jax-rs.itests/log4j.properties new file mode 100644 index 0000000..a136842 --- /dev/null +++ b/jax-rs.itests/log4j.properties @@ -0,0 +1,9 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=ERROR, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/cbd6ebd1/jax-rs.log4j-configuration/bnd.bnd ---------------------------------------------------------------------- diff --git a/jax-rs.log4j-configuration/bnd.bnd b/jax-rs.log4j-configuration/bnd.bnd deleted file mode 100644 index 121e309..0000000 --- a/jax-rs.log4j-configuration/bnd.bnd +++ /dev/null @@ -1 +0,0 @@ -Fragment-Host: log4j http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/cbd6ebd1/jax-rs.log4j-configuration/pom.xml ---------------------------------------------------------------------- diff --git a/jax-rs.log4j-configuration/pom.xml b/jax-rs.log4j-configuration/pom.xml deleted file mode 100644 index cf5f881..0000000 --- a/jax-rs.log4j-configuration/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> -<!-- - 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/xsd/maven-4.0.0.xsd"; -> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.rs</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - - <artifactId>org.apache.aries.jax.rs.log4j-configuration</artifactId> - <description>Apache Aries JAX-RS Log4J Configuration Fragment</description> - <name>Apache Aries JAX-RS Log4J Configuration Fragment</name> - - <build> - <plugins> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/cbd6ebd1/jax-rs.log4j-configuration/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/jax-rs.log4j-configuration/src/main/resources/log4j.properties b/jax-rs.log4j-configuration/src/main/resources/log4j.properties deleted file mode 100644 index a136842..0000000 --- a/jax-rs.log4j-configuration/src/main/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=ERROR, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/cbd6ebd1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 009ce6e..2830b70 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,6 @@ </build> <modules> <module>jax-rs.whiteboard</module> - <module>jax-rs.log4j-configuration</module> <module>jax-rs.itests</module> <module>jax-rs.example</module> </modules>
