http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-ftp/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-ftp/src/main/resources/log4j.properties b/examples/camel-example-ftp/src/main/resources/log4j.properties deleted file mode 100644 index 15ff9c4..0000000 --- a/examples/camel-example-ftp/src/main/resources/log4j.properties +++ /dev/null @@ -1,32 +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 - -# -# uncomment the following line to enable debugging of Camel FTP -# either using DEBUG or TRACE logging level -# -#log4j.logger.org.apache.camel.component.file.remote=DEBUG -#log4j.logger.org.apache.camel.component.file.remote=TRACE - -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-ftp/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-ftp/src/main/resources/log4j2.properties b/examples/camel-example-ftp/src/main/resources/log4j2.properties new file mode 100644 index 0000000..2f2e68b --- /dev/null +++ b/examples/camel-example-ftp/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-guice-jms/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-guice-jms/pom.xml b/examples/camel-example-guice-jms/pom.xml index d5ca2b9..739d8de 100644 --- a/examples/camel-example-guice-jms/pom.xml +++ b/examples/camel-example-guice-jms/pom.xml @@ -54,15 +54,22 @@ <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> </dependency> - - <!-- lets use log4j --> + + <!-- 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-guice-jms/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-guice-jms/src/main/resources/log4j.properties b/examples/camel-example-guice-jms/src/main/resources/log4j.properties deleted file mode 100644 index 0542109..0000000 --- a/examples/camel-example-guice-jms/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 used -# -log4j.rootLogger=INFO, out - -# -# uncomment the following line to enable debugging of Camel -# -#log4j.logger.org.apache.camel=DEBUG - -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 http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-guice-jms/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-guice-jms/src/main/resources/log4j2.properties b/examples/camel-example-guice-jms/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/examples/camel-example-guice-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.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-hystrix/client/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-hystrix/client/src/main/resources/log4j.properties b/examples/camel-example-hystrix/client/src/main/resources/log4j.properties deleted file mode 100644 index d04caeb..0000000 --- a/examples/camel-example-hystrix/client/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. -## ------------------------------------------------------------------------ - -# -# The logging properties used -# -log4j.rootLogger=INFO, stdout - -log4j.logger.org.apache.camel.zipkin=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-hystrix/client/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-hystrix/client/src/main/resources/log4j2.properties b/examples/camel-example-hystrix/client/src/main/resources/log4j2.properties new file mode 100644 index 0000000..23ec45d --- /dev/null +++ b/examples/camel-example-hystrix/client/src/main/resources/log4j2.properties @@ -0,0 +1,25 @@ +## --------------------------------------------------------------------------- +## 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 +logger.zipkin.name = org.apache.camel.zipkin +logger.zipkin.level = DEBUG +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-hystrix/service2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-hystrix/service2/pom.xml b/examples/camel-example-hystrix/service2/pom.xml index 03ceca3..c6e808b 100644 --- a/examples/camel-example-hystrix/service2/pom.xml +++ b/examples/camel-example-hystrix/service2/pom.xml @@ -72,16 +72,27 @@ <configuration> <mainClass>sample.camel.Service2Application</mainClass> </configuration> - <dependencies> + <dependencies> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</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-core</artifactId> + <version>${log4j2-version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j2-version}</version> + </dependency> + <dependency> + <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-hystrix/service2/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-hystrix/service2/src/main/resources/log4j.properties b/examples/camel-example-hystrix/service2/src/main/resources/log4j.properties deleted file mode 100644 index d04caeb..0000000 --- a/examples/camel-example-hystrix/service2/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. -## ------------------------------------------------------------------------ - -# -# The logging properties used -# -log4j.rootLogger=INFO, stdout - -log4j.logger.org.apache.camel.zipkin=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-hystrix/service2/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-hystrix/service2/src/main/resources/log4j2.properties b/examples/camel-example-hystrix/service2/src/main/resources/log4j2.properties new file mode 100644 index 0000000..23ec45d --- /dev/null +++ b/examples/camel-example-hystrix/service2/src/main/resources/log4j2.properties @@ -0,0 +1,25 @@ +## --------------------------------------------------------------------------- +## 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 +logger.zipkin.name = org.apache.camel.zipkin +logger.zipkin.level = DEBUG +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-jdbc/pom.xml b/examples/camel-example-jdbc/pom.xml index 6befd30..6789105 100644 --- a/examples/camel-example-jdbc/pom.xml +++ b/examples/camel-example-jdbc/pom.xml @@ -62,11 +62,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>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-jdbc/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-jdbc/src/main/resources/log4j.properties b/examples/camel-example-jdbc/src/main/resources/log4j.properties deleted file mode 100644 index 56ac980..0000000 --- a/examples/camel-example-jdbc/src/main/resources/log4j.properties +++ /dev/null @@ -1,31 +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.example.jdbc=DEBUG -#log4j.logger.org.apache.camel.component.jdbc=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-jdbc/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-jdbc/src/main/resources/log4j2.properties b/examples/camel-example-jdbc/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/examples/camel-example-jdbc/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-jms-file/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-jms-file/pom.xml b/examples/camel-example-jms-file/pom.xml index be58253..25a2e47 100755 --- a/examples/camel-example-jms-file/pom.xml +++ b/examples/camel-example-jms-file/pom.xml @@ -66,15 +66,22 @@ </exclusion> </exclusions> </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-jms-file/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-jms-file/src/main/resources/log4j.properties b/examples/camel-example-jms-file/src/main/resources/log4j.properties deleted file mode 100644 index f86c7aa..0000000 --- a/examples/camel-example-jms-file/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, out - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=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 http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-jms-file/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-jms-file/src/main/resources/log4j2.properties b/examples/camel-example-jms-file/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/examples/camel-example-jms-file/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-jmx/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-jmx/pom.xml b/examples/camel-example-jmx/pom.xml index 1636639..5f31a38 100644 --- a/examples/camel-example-jmx/pom.xml +++ b/examples/camel-example-jmx/pom.xml @@ -51,15 +51,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jmx</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-jmx/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-jmx/src/main/resources/log4j.properties b/examples/camel-example-jmx/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-jmx/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-jmx/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-jmx/src/main/resources/log4j2.properties b/examples/camel-example-jmx/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-jmx/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-loadbalancing/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-loadbalancing/pom.xml b/examples/camel-example-loadbalancing/pom.xml index 810fb5c..eefc912 100644 --- a/examples/camel-example-loadbalancing/pom.xml +++ b/examples/camel-example-loadbalancing/pom.xml @@ -45,15 +45,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-mina2</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-loadbalancing/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-loadbalancing/src/main/resources/log4j.properties b/examples/camel-example-loadbalancing/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-loadbalancing/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-loadbalancing/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-loadbalancing/src/main/resources/log4j2.properties b/examples/camel-example-loadbalancing/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-loadbalancing/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-loan-broker/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-loan-broker/pom.xml b/examples/camel-example-loan-broker/pom.xml index fcf5c7c..51aa7d2 100644 --- a/examples/camel-example-loan-broker/pom.xml +++ b/examples/camel-example-loan-broker/pom.xml @@ -95,15 +95,22 @@ </exclusion> </exclusions> </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> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-loan-broker/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-loan-broker/src/main/resources/log4j.properties b/examples/camel-example-loan-broker/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-loan-broker/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-loan-broker/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-loan-broker/src/main/resources/log4j2.properties b/examples/camel-example-loan-broker/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-loan-broker/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-management/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml index 8876573..712cd5c 100644 --- a/examples/camel-example-management/pom.xml +++ b/examples/camel-example-management/pom.xml @@ -61,15 +61,22 @@ <groupId>org.apache.xbean</groupId> <artifactId>xbean-spring</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-management/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-management/src/main/resources/log4j.properties b/examples/camel-example-management/src/main/resources/log4j.properties deleted file mode 100644 index 9a64fa0..0000000 --- a/examples/camel-example-management/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 used -# -log4j.rootLogger=INFO, out - -# -# uncomment the following line to enable debugging of Camel -# -#log4j.logger.org.apache.camel=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-management/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-management/src/main/resources/log4j2.properties b/examples/camel-example-management/src/main/resources/log4j2.properties new file mode 100644 index 0000000..2f2e68b --- /dev/null +++ b/examples/camel-example-management/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-netty-http/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-netty-http/pom.xml b/examples/camel-example-netty-http/pom.xml index 55b5f74..acebf89 100644 --- a/examples/camel-example-netty-http/pom.xml +++ b/examples/camel-example-netty-http/pom.xml @@ -47,15 +47,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-netty-http</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-osgi-rmi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-osgi-rmi/pom.xml b/examples/camel-example-osgi-rmi/pom.xml index 263a041..126ddc6 100644 --- a/examples/camel-example-osgi-rmi/pom.xml +++ b/examples/camel-example-osgi-rmi/pom.xml @@ -56,15 +56,22 @@ <artifactId>camel-test-spring</artifactId> <scope>test</scope> </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.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> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-osgi-rmi/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-osgi-rmi/src/main/resources/log4j.properties b/examples/camel-example-osgi-rmi/src/main/resources/log4j.properties deleted file mode 100644 index a27ee29..0000000 --- a/examples/camel-example-osgi-rmi/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 - -# Camel logging -#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-osgi-rmi/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-osgi-rmi/src/main/resources/log4j2.properties b/examples/camel-example-osgi-rmi/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-osgi-rmi/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-pojo-messaging/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml index b53aa10..f88d45e 100644 --- a/examples/camel-example-pojo-messaging/pom.xml +++ b/examples/camel-example-pojo-messaging/pom.xml @@ -71,15 +71,22 @@ <groupId>org.apache.xbean</groupId> <artifactId>xbean-spring</artifactId> </dependency> - - <!-- lets use log4j --> + + <!-- 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> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-pojo-messaging/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-pojo-messaging/src/main/resources/log4j.properties b/examples/camel-example-pojo-messaging/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-pojo-messaging/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-pojo-messaging/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-pojo-messaging/src/main/resources/log4j2.properties b/examples/camel-example-pojo-messaging/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-pojo-messaging/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-reportincident-wssecurity/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml index 5a9ce01..eaed8c1 100644 --- a/examples/camel-example-reportincident-wssecurity/pom.xml +++ b/examples/camel-example-reportincident-wssecurity/pom.xml @@ -142,15 +142,22 @@ <artifactId>cxf-rt-ws-security</artifactId> <version>${cxf-version}</version> </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> <!-- cxf web container for unit testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-reportincident-wssecurity/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident-wssecurity/src/main/resources/log4j.properties b/examples/camel-example-reportincident-wssecurity/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-reportincident-wssecurity/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-reportincident-wssecurity/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident-wssecurity/src/main/resources/log4j2.properties b/examples/camel-example-reportincident-wssecurity/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-reportincident-wssecurity/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-reportincident/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml index 100bc0d..ecd8cdf 100755 --- a/examples/camel-example-reportincident/pom.xml +++ b/examples/camel-example-reportincident/pom.xml @@ -98,15 +98,22 @@ <artifactId>cxf-rt-transports-http</artifactId> <version>${cxf-version}</version> </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> <!-- cxf web container for unit testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-reportincident/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident/src/main/resources/log4j.properties b/examples/camel-example-reportincident/src/main/resources/log4j.properties deleted file mode 100755 index 0057e0d..0000000 --- a/examples/camel-example-reportincident/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-reportincident/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-reportincident/src/main/resources/log4j2.properties b/examples/camel-example-reportincident/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-reportincident/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-restlet-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-restlet-jdbc/pom.xml b/examples/camel-example-restlet-jdbc/pom.xml index d170dcd..b1836e0 100755 --- a/examples/camel-example-restlet-jdbc/pom.xml +++ b/examples/camel-example-restlet-jdbc/pom.xml @@ -73,9 +73,22 @@ <artifactId>org.restlet.ext.spring</artifactId> <version>${restlet-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>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-restlet-jdbc/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-restlet-jdbc/src/main/resources/log4j.properties b/examples/camel-example-restlet-jdbc/src/main/resources/log4j.properties deleted file mode 100755 index f6a74d5..0000000 --- a/examples/camel-example-restlet-jdbc/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.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 -log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-restlet-jdbc/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-restlet-jdbc/src/main/resources/log4j2.properties b/examples/camel-example-restlet-jdbc/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-restlet-jdbc/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-route-throttling/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-route-throttling/pom.xml b/examples/camel-example-route-throttling/pom.xml index da4f98f..01376fa 100644 --- a/examples/camel-example-route-throttling/pom.xml +++ b/examples/camel-example-route-throttling/pom.xml @@ -66,15 +66,22 @@ <groupId>org.apache.xbean</groupId> <artifactId>xbean-spring</artifactId> </dependency> - - <!-- 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-route-throttling/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-route-throttling/src/main/resources/log4j.properties b/examples/camel-example-route-throttling/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-route-throttling/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-route-throttling/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-route-throttling/src/main/resources/log4j2.properties b/examples/camel-example-route-throttling/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-route-throttling/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-servlet-rest-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml b/examples/camel-example-servlet-rest-blueprint/pom.xml index 55fead4..317e2ef 100755 --- a/examples/camel-example-servlet-rest-blueprint/pom.xml +++ b/examples/camel-example-servlet-rest-blueprint/pom.xml @@ -65,25 +65,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jackson</artifactId> </dependency> - + <!-- logging --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <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>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.0.13</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>1.0.13</version> + <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-servlet-rest-blueprint/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-rest-blueprint/src/main/resources/log4j.properties b/examples/camel-example-servlet-rest-blueprint/src/main/resources/log4j.properties deleted file mode 100755 index ed9a8f1..0000000 --- a/examples/camel-example-servlet-rest-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. -## ------------------------------------------------------------------------ - -# 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-servlet-rest-blueprint/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-rest-blueprint/src/main/resources/log4j2.properties b/examples/camel-example-servlet-rest-blueprint/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-servlet-rest-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.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-servlet-tomcat-no-spring/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml b/examples/camel-example-servlet-tomcat-no-spring/pom.xml index 3c54ece..775b868 100755 --- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml +++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml @@ -48,15 +48,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-servlet</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-servlet-tomcat-no-spring/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/log4j.properties b/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/log4j.properties deleted file mode 100755 index a6b00bb..0000000 --- a/examples/camel-example-servlet-tomcat-no-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. -## ------------------------------------------------------------------------ - -# 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-no-spring/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/log4j2.properties b/examples/camel-example-servlet-tomcat-no-spring/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-servlet-tomcat-no-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.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-servlet-tomcat/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-servlet-tomcat/pom.xml b/examples/camel-example-servlet-tomcat/pom.xml index a771a0b..2c4680d 100755 --- a/examples/camel-example-servlet-tomcat/pom.xml +++ b/examples/camel-example-servlet-tomcat/pom.xml @@ -52,15 +52,22 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</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>