http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties b/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties deleted file mode 100755 index a6b00bb..0000000 --- a/examples/camel-example-servlet-tomcat/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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. -## ------------------------------------------------------------------------ - -# default properties to initialise log4j -log4j.rootLogger=INFO, console - -# settings for specific packages -#log4j.logger.org.apache.camel.component.http=DEBUG -#log4j.logger.org.apache.camel.component.servlet=DEBUG -#log4j.logger.org.apache.camel=DEBUG - -# Console appender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-servlet-tomcat/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-tomcat/src/main/resources/log4j2.properties b/examples/camel-example-servlet-tomcat/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-servlet-tomcat/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties b/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j2.properties b/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-simplejirabot/javadsl/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-simplejirabot/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-simplejirabot/pom.xml b/examples/camel-example-simplejirabot/pom.xml index b473dbe..7abc97c 100644 --- a/examples/camel-example-simplejirabot/pom.xml +++ b/examples/camel-example-simplejirabot/pom.xml @@ -60,15 +60,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-irc</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <!-- for testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties b/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j2.properties b/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-simplejirabot/xmlconf/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spark-rest/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spark-rest/pom.xml b/examples/camel-example-spark-rest/pom.xml index 86e56d1..b032af9 100755 --- a/examples/camel-example-spark-rest/pom.xml +++ b/examples/camel-example-spark-rest/pom.xml @@ -51,15 +51,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jackson</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spark-rest/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spark-rest/src/main/resources/log4j.properties b/examples/camel-example-spark-rest/src/main/resources/log4j.properties deleted file mode 100755 index 6cf71c5..0000000 --- a/examples/camel-example-spark-rest/src/main/resources/log4j.properties +++ /dev/null @@ -1,28 +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. -## ------------------------------------------------------------------------ - -# default properties to initialise log4j -log4j.rootLogger=INFO, console - -# settings for specific packages -#log4j.logger.org.apache.camel.component.sparkrest=DEBUG -#log4j.logger.org.apache.camel=DEBUG - -# Console appender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spark-rest/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spark-rest/src/main/resources/log4j2.properties b/examples/camel-example-spark-rest/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-spark-rest/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-splunk/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-splunk/pom.xml b/examples/camel-example-splunk/pom.xml index b064e88..f6a0c9b 100644 --- a/examples/camel-example-splunk/pom.xml +++ b/examples/camel-example-splunk/pom.xml @@ -41,16 +41,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-splunk</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java b/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java index 9f2d176..38bb543 100644 --- a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java +++ b/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkPublishEventClient.java @@ -19,11 +19,12 @@ package org.apache.camel.example.splunk; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class SplunkPublishEventClient { - private static final Logger LOG = Logger.getLogger(SplunkPublishEventClient.class); + private static final Logger LOG = LoggerFactory.getLogger(SplunkPublishEventClient.class); private SplunkPublishEventClient() { } http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java b/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java index 9fe1ea2..285a471 100644 --- a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java +++ b/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSavedSearchClient.java @@ -17,11 +17,12 @@ package org.apache.camel.example.splunk; import org.apache.camel.main.Main; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class SplunkSavedSearchClient { - private static final Logger LOG = Logger.getLogger(SplunkSavedSearchClient.class); + private static final Logger LOG = LoggerFactory.getLogger(SplunkSavedSearchClient.class); private SplunkSavedSearchClient() { } http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java b/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java index c13c8e2..616d2c8 100644 --- a/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java +++ b/examples/camel-example-splunk/src/main/java/org/apache/camel/example/splunk/SplunkSearchClient.java @@ -17,11 +17,12 @@ package org.apache.camel.example.splunk; import org.apache.camel.main.Main; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public final class SplunkSearchClient { - private static final Logger LOG = Logger.getLogger(SplunkSearchClient.class); + private static final Logger LOG = LoggerFactory.getLogger(SplunkSearchClient.class); private SplunkSearchClient() { } http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-splunk/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-splunk/src/main/resources/log4j.properties b/examples/camel-example-splunk/src/main/resources/log4j.properties deleted file mode 100644 index 6d6be77..0000000 --- a/examples/camel-example-splunk/src/main/resources/log4j.properties +++ /dev/null @@ -1,26 +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 -# -log4j.rootLogger=INFO, out -#log4j.logger.org.apache.camel.component.splunk=DEBUG - -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-splunk/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-splunk/src/main/resources/log4j2.properties b/examples/camel-example-splunk/src/main/resources/log4j2.properties new file mode 100644 index 0000000..2f2e68b --- /dev/null +++ b/examples/camel-example-splunk/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-dm/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-dm/pom.xml b/examples/camel-example-spring-dm/pom.xml index e896fe6..9ed7287 100644 --- a/examples/camel-example-spring-dm/pom.xml +++ b/examples/camel-example-spring-dm/pom.xml @@ -45,11 +45,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> </dependency> - - <!-- used for mvn camel:run --> + + <!-- logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> + </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-javaconfig/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/camel-example-spring-javaconfig/pom.xml index df456e3..bafc8f1 100644 --- a/examples/camel-example-spring-javaconfig/pom.xml +++ b/examples/camel-example-spring-javaconfig/pom.xml @@ -55,15 +55,22 @@ <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <!-- for testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties b/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-spring-javaconfig/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-javaconfig/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-javaconfig/src/main/resources/log4j2.properties b/examples/camel-example-spring-javaconfig/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-spring-javaconfig/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-jms/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml index 1a91e6b..57e109d 100644 --- a/examples/camel-example-spring-jms/pom.xml +++ b/examples/camel-example-spring-jms/pom.xml @@ -68,15 +68,22 @@ <artifactId>xbean-spring</artifactId> </dependency> <!-- END SNIPPET: e2 --> - - <!-- for logging using log4j.properties in src/main/resources --> + + <!-- logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <!-- for testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-jms/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-jms/src/main/resources/log4j.properties b/examples/camel-example-spring-jms/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-spring-jms/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-jms/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-jms/src/main/resources/log4j2.properties b/examples/camel-example-spring-jms/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-spring-jms/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-security/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-security/pom.xml b/examples/camel-example-spring-security/pom.xml index 5bb85c3..eba9653 100755 --- a/examples/camel-example-spring-security/pom.xml +++ b/examples/camel-example-spring-security/pom.xml @@ -53,14 +53,22 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </dependency> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <!-- for testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-security/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-security/src/main/resources/log4j.properties b/examples/camel-example-spring-security/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-spring-security/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-security/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-security/src/main/resources/log4j2.properties b/examples/camel-example-spring-security/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-spring-security/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-ws/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml index d3bcf57..66d02b4 100644 --- a/examples/camel-example-spring-ws/pom.xml +++ b/examples/camel-example-spring-ws/pom.xml @@ -57,15 +57,22 @@ <artifactId>wsdl4j</artifactId> <version>${wsdl4j-version}</version> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <!-- for testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-ws/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-ws/src/main/resources/log4j.properties b/examples/camel-example-spring-ws/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-spring-ws/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-ws/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-ws/src/main/resources/log4j2.properties b/examples/camel-example-spring-ws/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-spring-ws/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-xquery/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-xquery/pom.xml b/examples/camel-example-spring-xquery/pom.xml index 2224c40..56efa5c 100755 --- a/examples/camel-example-spring-xquery/pom.xml +++ b/examples/camel-example-spring-xquery/pom.xml @@ -62,15 +62,22 @@ <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <!-- for testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-xquery/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-xquery/src/main/resources/log4j.properties b/examples/camel-example-spring-xquery/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-spring-xquery/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring-xquery/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-xquery/src/main/resources/log4j2.properties b/examples/camel-example-spring-xquery/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-spring-xquery/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring/pom.xml b/examples/camel-example-spring/pom.xml index d5ef6ed..481474e 100755 --- a/examples/camel-example-spring/pom.xml +++ b/examples/camel-example-spring/pom.xml @@ -56,15 +56,22 @@ <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> <!-- for testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring/src/main/resources/log4j.properties b/examples/camel-example-spring/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-spring/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-spring/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring/src/main/resources/log4j2.properties b/examples/camel-example-spring/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-spring/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-sql-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-sql-blueprint/pom.xml b/examples/camel-example-sql-blueprint/pom.xml index ef63459..be40e08 100644 --- a/examples/camel-example-sql-blueprint/pom.xml +++ b/examples/camel-example-sql-blueprint/pom.xml @@ -58,15 +58,22 @@ <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-sql-blueprint/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-sql-blueprint/src/main/resources/log4j.properties b/examples/camel-example-sql-blueprint/src/main/resources/log4j.properties deleted file mode 100644 index 70c9b65..0000000 --- a/examples/camel-example-sql-blueprint/src/main/resources/log4j.properties +++ /dev/null @@ -1,30 +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 -# -log4j.rootLogger=INFO, out - -#log4j.logger.org.apache.camel.component.sql=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 - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-sql-blueprint/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-sql-blueprint/src/main/resources/log4j2.properties b/examples/camel-example-sql-blueprint/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/examples/camel-example-sql-blueprint/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.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.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-sql/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-sql/pom.xml b/examples/camel-example-sql/pom.xml index c248056..1175126 100644 --- a/examples/camel-example-sql/pom.xml +++ b/examples/camel-example-sql/pom.xml @@ -58,15 +58,22 @@ <groupId>commons-dbcp</groupId> <artifactId>commons-dbcp</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-sql/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-sql/src/main/resources/log4j.properties b/examples/camel-example-sql/src/main/resources/log4j.properties deleted file mode 100644 index 70c9b65..0000000 --- a/examples/camel-example-sql/src/main/resources/log4j.properties +++ /dev/null @@ -1,30 +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 -# -log4j.rootLogger=INFO, out - -#log4j.logger.org.apache.camel.component.sql=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 - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-sql/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-sql/src/main/resources/log4j2.properties b/examples/camel-example-sql/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/examples/camel-example-sql/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.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.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-ssh-security/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-ssh-security/pom.xml b/examples/camel-example-ssh-security/pom.xml index dbb32ca..e9fcd81 100644 --- a/examples/camel-example-ssh-security/pom.xml +++ b/examples/camel-example-ssh-security/pom.xml @@ -71,21 +71,21 @@ <artifactId>bcpkix-jdk15on</artifactId> <version>${bouncycastle-version}</version> </dependency> - - <!-- logging dependencies --> + + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>runtime</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-ssh-security/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-ssh-security/src/main/resources/log4j.properties b/examples/camel-example-ssh-security/src/main/resources/log4j.properties deleted file mode 100644 index 8d1de4f..0000000 --- a/examples/camel-example-ssh-security/src/main/resources/log4j.properties +++ /dev/null @@ -1,71 +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 during tests.. -# -log4j.rootLogger=INFO, out - -#log4j.logger.org.apache.camel.impl.converter=WARN -#log4j.logger.org.apache.camel.management=WARN -log4j.logger.org.apache.camel.impl.DefaultPackageScanClassResolver=WARN -#log4j.logger.org.apache.camel.impl.converter.DefaultTypeConverter=TRACE -#log4j.logger.org.apache.camel.impl.converter=DEBUG - -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.builder=TRACE -#log4j.logger.org.apache.camel.language.simple=TRACE -#log4j.logger.org.apache.camel.component=TRACE -#log4j.logger.org.apache.camel.component.seda=TRACE -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.impl.DefaultUnitOfWork=TRACE -#log4j.logger.org.apache.camel.impl.DefaultExecutorServiceManager=TRACE -#log4j.logger.org.apache.camel.component.mock=DEBUG -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.processor.DefaultErrorHandler=TRACE -#log4j.logger.org.apache.camel.processor.Pipeline=TRACE -#log4j.logger.org.apache.camel.processor.MulticastProcessor=TRACE -#log4j.logger.org.apache.camel.processor.RecipientList=TRACE -#log4j.logger.org.apache.camel.processor.RecipientListProcessor=TRACE -#log4j.logger.org.apache.camel.processor.RoutingSlip=TRACE -#log4j.logger.org.apache.camel.processor.TryProcessor=TRACE -#log4j.logger.org.apache.camel.processor.loadbalancer=TRACE -#log4j.logger.org.apache.camel.processor.Delayer=TRACE -#log4j.logger.org.apache.camel.processor.Throttler=TRACE -#log4j.logger.org.apache.camel.processor.aggregate.AggregateProcessor=DEBUG -#log4j.logger.org.apache.camel.impl=TRACE -#log4j.logger.org.apache.camel.util.FileUtil=TRACE -#log4j.logger.org.apache.camel.util.AsyncProcessorHelper=TRACE -#log4j.logger.org.apache.camel.util.ServiceHelper=TRACE -#log4j.logger.org.apache.camel.util.jsse=TRACE - -# 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=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camelexchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.file=target/camel-core-test.log -log4j.appender.file.append=true -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-ssh-security/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-ssh-security/src/main/resources/log4j2.properties b/examples/camel-example-ssh-security/src/main/resources/log4j2.properties new file mode 100644 index 0000000..ac50901 --- /dev/null +++ b/examples/camel-example-ssh-security/src/main/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-core-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 = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +logger.DefaultPackageScanClassResolver.name = org.apache.camel.impl.DefaultPackageScanClassResolver +logger.DefaultPackageScanClassResolver.level = WARN +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-ssh/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-ssh/pom.xml b/examples/camel-example-ssh/pom.xml index d66c506..4c5fffb 100644 --- a/examples/camel-example-ssh/pom.xml +++ b/examples/camel-example-ssh/pom.xml @@ -53,21 +53,21 @@ <groupId>org.apache.mina</groupId> <artifactId>mina-core</artifactId> </dependency> - - <!-- logging dependencies --> + + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>runtime</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-ssh/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-ssh/src/main/resources/log4j.properties b/examples/camel-example-ssh/src/main/resources/log4j.properties deleted file mode 100644 index 8d1de4f..0000000 --- a/examples/camel-example-ssh/src/main/resources/log4j.properties +++ /dev/null @@ -1,71 +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 during tests.. -# -log4j.rootLogger=INFO, out - -#log4j.logger.org.apache.camel.impl.converter=WARN -#log4j.logger.org.apache.camel.management=WARN -log4j.logger.org.apache.camel.impl.DefaultPackageScanClassResolver=WARN -#log4j.logger.org.apache.camel.impl.converter.DefaultTypeConverter=TRACE -#log4j.logger.org.apache.camel.impl.converter=DEBUG - -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.builder=TRACE -#log4j.logger.org.apache.camel.language.simple=TRACE -#log4j.logger.org.apache.camel.component=TRACE -#log4j.logger.org.apache.camel.component.seda=TRACE -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.impl.DefaultUnitOfWork=TRACE -#log4j.logger.org.apache.camel.impl.DefaultExecutorServiceManager=TRACE -#log4j.logger.org.apache.camel.component.mock=DEBUG -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.processor.DefaultErrorHandler=TRACE -#log4j.logger.org.apache.camel.processor.Pipeline=TRACE -#log4j.logger.org.apache.camel.processor.MulticastProcessor=TRACE -#log4j.logger.org.apache.camel.processor.RecipientList=TRACE -#log4j.logger.org.apache.camel.processor.RecipientListProcessor=TRACE -#log4j.logger.org.apache.camel.processor.RoutingSlip=TRACE -#log4j.logger.org.apache.camel.processor.TryProcessor=TRACE -#log4j.logger.org.apache.camel.processor.loadbalancer=TRACE -#log4j.logger.org.apache.camel.processor.Delayer=TRACE -#log4j.logger.org.apache.camel.processor.Throttler=TRACE -#log4j.logger.org.apache.camel.processor.aggregate.AggregateProcessor=DEBUG -#log4j.logger.org.apache.camel.impl=TRACE -#log4j.logger.org.apache.camel.util.FileUtil=TRACE -#log4j.logger.org.apache.camel.util.AsyncProcessorHelper=TRACE -#log4j.logger.org.apache.camel.util.ServiceHelper=TRACE -#log4j.logger.org.apache.camel.util.jsse=TRACE - -# 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=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camelexchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.file=target/camel-core-test.log -log4j.appender.file.append=true -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-ssh/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-ssh/src/main/resources/log4j2.properties b/examples/camel-example-ssh/src/main/resources/log4j2.properties new file mode 100644 index 0000000..ac50901 --- /dev/null +++ b/examples/camel-example-ssh/src/main/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-core-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 = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +logger.DefaultPackageScanClassResolver.name = org.apache.camel.impl.DefaultPackageScanClassResolver +logger.DefaultPackageScanClassResolver.level = WARN +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-swagger-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-cdi/pom.xml b/examples/camel-example-swagger-cdi/pom.xml index cac4015..56d150a 100644 --- a/examples/camel-example-swagger-cdi/pom.xml +++ b/examples/camel-example-swagger-cdi/pom.xml @@ -82,16 +82,27 @@ <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se</artifactId> <version>${weld2-version}</version> + </dependency> + <!-- logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j2-version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j2-version}</version> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2-version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${log4j2-version}</version> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-swagger-cdi/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-cdi/src/main/resources/log4j.properties b/examples/camel-example-swagger-cdi/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-swagger-cdi/src/main/resources/log4j.properties +++ /dev/null @@ -1,29 +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 -# -log4j.rootLogger=INFO, stdout - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-swagger-cdi/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-cdi/src/main/resources/log4j2.properties b/examples/camel-example-swagger-cdi/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-swagger-cdi/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.stdout.type = Console +appender.stdout.name = stdout +appender.stdout.layout.type = PatternLayout +appender.stdout.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-swagger-osgi/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-osgi/src/main/resources/log4j.properties b/examples/camel-example-swagger-osgi/src/main/resources/log4j.properties deleted file mode 100755 index ed9a8f1..0000000 --- a/examples/camel-example-swagger-osgi/src/main/resources/log4j.properties +++ /dev/null @@ -1,30 +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. -## ------------------------------------------------------------------------ - -# default properties to initialise log4j -log4j.rootLogger=INFO, console - -# settings for specific packages -#log4j.logger.com.wordnik.swagger=DEBUG -#log4j.logger.org.apache.camel.component.servlet=DEBUG -#log4j.logger.org.apache.camel.component.swagger=DEBUG -#log4j.logger.org.apache.camel=DEBUG - -# Console appender -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-swagger-osgi/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-osgi/src/main/resources/log4j2.properties b/examples/camel-example-swagger-osgi/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-swagger-osgi/src/main/resources/log4j2.properties @@ -0,0 +1,23 @@ +## --------------------------------------------------------------------------- +## 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.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.console.ref = console
