Repository: camel Updated Branches: refs/heads/master 664637fce -> b9f91f4d3
CAMEL-10224: Upgrade log4j to lg4j2 (camel-spark-rest) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9c595388 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9c595388 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9c595388 Branch: refs/heads/master Commit: 9c5953888ea7e1c0b0965f31992f0a537f223d06 Parents: 664637f Author: lburgazzoli <lburgazz...@gmail.com> Authored: Fri Aug 12 09:33:02 2016 +0200 Committer: lburgazzoli <lburgazz...@gmail.com> Committed: Fri Aug 12 09:33:02 2016 +0200 ---------------------------------------------------------------------- components/camel-spark-rest/pom.xml | 21 ++++++++++-- .../src/test/resources/log4j.properties | 36 -------------------- .../src/test/resources/log4j2.properties | 30 ++++++++++++++++ 3 files changed, 49 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9c595388/components/camel-spark-rest/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml index b8ba802..617e86f 100644 --- a/components/camel-spark-rest/pom.xml +++ b/components/camel-spark-rest/pom.xml @@ -113,11 +113,28 @@ <scope>test</scope> </dependency> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <!-- unit testing requires java 8 --> http://git-wip-us.apache.org/repos/asf/camel/blob/9c595388/components/camel-spark-rest/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/src/test/resources/log4j.properties b/components/camel-spark-rest/src/test/resources/log4j.properties deleted file mode 100644 index 10c5355..0000000 --- a/components/camel-spark-rest/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -## ------------------------------------------------------------------------ -## 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. -## ------------------------------------------------------------------------ - -# -# The logging properties used for testing. -# -log4j.rootLogger=INFO, file - -#log4j.logger.org.apache.camel.component.sparkrest=DEBUG - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-spark-rest-test.log -log4j.appender.file.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/9c595388/components/camel-spark-rest/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-spark-rest/src/test/resources/log4j2.properties b/components/camel-spark-rest/src/test/resources/log4j2.properties new file mode 100644 index 0000000..6c9c91e --- /dev/null +++ b/components/camel-spark-rest/src/test/resources/log4j2.properties @@ -0,0 +1,30 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-spark-rest-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n + +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n + +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file
