http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-box-osgi/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-box-osgi/src/test/resources/log4j.properties b/examples/camel-example-box-osgi/src/test/resources/log4j.properties deleted file mode 100644 index 8e97c07..0000000 --- a/examples/camel-example-box-osgi/src/test/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 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=[%10.10t] %-30.30c{1} %-5p %m%n -
http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-box-osgi/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-box-osgi/src/test/resources/log4j2.properties b/examples/camel-example-box-osgi/src/test/resources/log4j2.properties new file mode 100644 index 0000000..699897b --- /dev/null +++ b/examples/camel-example-box-osgi/src/test/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 = [%10.10t] %-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-cafe/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml index 4ca9fe3..76d7755 100755 --- a/examples/camel-example-cafe/pom.xml +++ b/examples/camel-example-cafe/pom.xml @@ -42,14 +42,21 @@ <artifactId>camel-spring</artifactId> </dependency> - <!-- lets use log4j --> + <!-- 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-cafe/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cafe/src/main/resources/log4j.properties b/examples/camel-example-cafe/src/main/resources/log4j.properties deleted file mode 100644 index 998f69e..0000000 --- a/examples/camel-example-cafe/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 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-cafe/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cafe/src/main/resources/log4j2.properties b/examples/camel-example-cafe/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/examples/camel-example-cafe/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-cafe/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cafe/src/test/resources/log4j2.properties b/examples/camel-example-cafe/src/test/resources/log4j2.properties new file mode 100644 index 0000000..3fadd1c --- /dev/null +++ b/examples/camel-example-cafe/src/test/resources/log4j2.properties @@ -0,0 +1,24 @@ +## --------------------------------------------------------------------------- +## 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-cdi-cassandraql/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-cassandraql/pom.xml b/examples/camel-example-cdi-cassandraql/pom.xml index c710749..dfcfdd2 100755 --- a/examples/camel-example-cdi-cassandraql/pom.xml +++ b/examples/camel-example-cdi-cassandraql/pom.xml @@ -64,16 +64,20 @@ <scope>runtime</scope> </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-cdi-cassandraql/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-cassandraql/src/main/resources/log4j.properties b/examples/camel-example-cdi-cassandraql/src/main/resources/log4j.properties deleted file mode 100755 index f5aae04..0000000 --- a/examples/camel-example-cdi-cassandraql/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +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.cdi=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-cdi-cassandraql/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-cassandraql/src/main/resources/log4j2.properties b/examples/camel-example-cdi-cassandraql/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cdi-cassandraql/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-cdi-kubernetes/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-kubernetes/pom.xml b/examples/camel-example-cdi-kubernetes/pom.xml index 31c2e2c..d25dc00 100755 --- a/examples/camel-example-cdi-kubernetes/pom.xml +++ b/examples/camel-example-cdi-kubernetes/pom.xml @@ -63,17 +63,21 @@ <version>${deltaspike-version}</version> <scope>runtime</scope> </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-cdi-kubernetes/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-kubernetes/src/main/resources/log4j.properties b/examples/camel-example-cdi-kubernetes/src/main/resources/log4j.properties deleted file mode 100755 index f5aae04..0000000 --- a/examples/camel-example-cdi-kubernetes/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +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.cdi=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-cdi-kubernetes/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-kubernetes/src/main/resources/log4j2.properties b/examples/camel-example-cdi-kubernetes/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cdi-kubernetes/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-cdi-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml index a88deb0..4dc17c3 100755 --- a/examples/camel-example-cdi-metrics/pom.xml +++ b/examples/camel-example-cdi-metrics/pom.xml @@ -57,16 +57,21 @@ <artifactId>metrics-cdi</artifactId> <version>1.3.3</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> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cdi-metrics/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-metrics/src/main/resources/log4j.properties b/examples/camel-example-cdi-metrics/src/main/resources/log4j.properties deleted file mode 100755 index f5aae04..0000000 --- a/examples/camel-example-cdi-metrics/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +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.cdi=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-cdi-metrics/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-metrics/src/main/resources/log4j2.properties b/examples/camel-example-cdi-metrics/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cdi-metrics/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-cdi-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-osgi/pom.xml b/examples/camel-example-cdi-osgi/pom.xml index 535d733..9b51aa1 100755 --- a/examples/camel-example-cdi-osgi/pom.xml +++ b/examples/camel-example-cdi-osgi/pom.xml @@ -73,16 +73,21 @@ <artifactId>org.osgi.compendium</artifactId> <scope>provided</scope> </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> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cdi-osgi/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-osgi/src/main/resources/log4j.properties b/examples/camel-example-cdi-osgi/src/main/resources/log4j.properties deleted file mode 100644 index 332fc9b..0000000 --- a/examples/camel-example-cdi-osgi/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +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.cdi=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 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cdi-osgi/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-osgi/src/main/resources/log4j2.properties b/examples/camel-example-cdi-osgi/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cdi-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 http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cdi-properties/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml index 940f185..2b130b8 100755 --- a/examples/camel-example-cdi-properties/pom.xml +++ b/examples/camel-example-cdi-properties/pom.xml @@ -65,16 +65,21 @@ <version>${deltaspike-version}</version> <scope>runtime</scope> </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> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cdi-properties/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-properties/src/main/resources/log4j.properties b/examples/camel-example-cdi-properties/src/main/resources/log4j.properties deleted file mode 100755 index f5aae04..0000000 --- a/examples/camel-example-cdi-properties/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +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.cdi=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-cdi-properties/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-properties/src/main/resources/log4j2.properties b/examples/camel-example-cdi-properties/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cdi-properties/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-cdi-rest-servlet/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml index 51117a6..50ce505 100755 --- a/examples/camel-example-cdi-rest-servlet/pom.xml +++ b/examples/camel-example-cdi-rest-servlet/pom.xml @@ -51,16 +51,21 @@ <artifactId>camel-servlet</artifactId> <scope>runtime</scope> </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> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cdi-rest-servlet/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-rest-servlet/src/main/resources/log4j.properties b/examples/camel-example-cdi-rest-servlet/src/main/resources/log4j.properties deleted file mode 100755 index f5aae04..0000000 --- a/examples/camel-example-cdi-rest-servlet/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +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.cdi=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-cdi-rest-servlet/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-rest-servlet/src/main/resources/log4j2.properties b/examples/camel-example-cdi-rest-servlet/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cdi-rest-servlet/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-cdi-test/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml index b2ad0ab..fcfb5d2 100644 --- a/examples/camel-example-cdi-test/pom.xml +++ b/examples/camel-example-cdi-test/pom.xml @@ -45,19 +45,24 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-cdi</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.slf4j</groupId> - <artifactId>slf4j-log4j12</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> + <!-- test --> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cdi-test/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-test/src/main/resources/log4j.properties b/examples/camel-example-cdi-test/src/main/resources/log4j.properties deleted file mode 100755 index c6bab0f..0000000 --- a/examples/camel-example-cdi-test/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.cdi=DEBUG -#log4j.logger.org.jboss.weld=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-cdi-test/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-test/src/main/resources/log4j2.properties b/examples/camel-example-cdi-test/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cdi-test/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-cdi-xml/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-xml/pom.xml b/examples/camel-example-cdi-xml/pom.xml index ebdb367..d7cb0ff 100755 --- a/examples/camel-example-cdi-xml/pom.xml +++ b/examples/camel-example-cdi-xml/pom.xml @@ -54,16 +54,21 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-stream</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> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cdi-xml/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-xml/src/main/resources/log4j.properties b/examples/camel-example-cdi-xml/src/main/resources/log4j.properties deleted file mode 100755 index f5aae04..0000000 --- a/examples/camel-example-cdi-xml/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +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.cdi=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-cdi-xml/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-xml/src/main/resources/log4j2.properties b/examples/camel-example-cdi-xml/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cdi-xml/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-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml index b20d0f9..c29332f 100644 --- a/examples/camel-example-cdi/pom.xml +++ b/examples/camel-example-cdi/pom.xml @@ -67,15 +67,26 @@ <artifactId>weld-se</artifactId> <version>${weld2-version}</version> </dependency> + <!-- 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-cdi/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi/src/main/resources/log4j.properties b/examples/camel-example-cdi/src/main/resources/log4j.properties deleted file mode 100644 index 0057e0d..0000000 --- a/examples/camel-example-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-cdi/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi/src/main/resources/log4j2.properties b/examples/camel-example-cdi/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a937db3 --- /dev/null +++ b/examples/camel-example-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-console/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-console/pom.xml b/examples/camel-example-console/pom.xml index 53e553a..8ec26f7 100644 --- a/examples/camel-example-console/pom.xml +++ b/examples/camel-example-console/pom.xml @@ -45,15 +45,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-stream</artifactId> </dependency> - - <!-- logging to the console --> + + <!-- 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-console/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-console/src/main/resources/log4j.properties b/examples/camel-example-console/src/main/resources/log4j.properties deleted file mode 100644 index beefa8c..0000000 --- a/examples/camel-example-console/src/main/resources/log4j.properties +++ /dev/null @@ -1,27 +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. -## ------------------------------------------------------------------------ - - -log4j.rootLogger=INFO, out - -# uncomment the following line to turn on Camel debugging -#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-console/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-console/src/main/resources/log4j2.properties b/examples/camel-example-console/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/examples/camel-example-console/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-cxf-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml index 518edde..9655385 100644 --- a/examples/camel-example-cxf-blueprint/pom.xml +++ b/examples/camel-example-cxf-blueprint/pom.xml @@ -52,15 +52,24 @@ <version>${cxf-version}</version> <scope>test</scope> </dependency> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>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> + <!-- test --> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cxf-blueprint/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-blueprint/src/test/resources/log4j.properties b/examples/camel-example-cxf-blueprint/src/test/resources/log4j.properties deleted file mode 100644 index 8e97c07..0000000 --- a/examples/camel-example-cxf-blueprint/src/test/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 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=[%10.10t] %-30.30c{1} %-5p %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cxf-blueprint/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-blueprint/src/test/resources/log4j2.properties b/examples/camel-example-cxf-blueprint/src/test/resources/log4j2.properties new file mode 100644 index 0000000..699897b --- /dev/null +++ b/examples/camel-example-cxf-blueprint/src/test/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 = [%10.10t] %-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-cxf-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-osgi/pom.xml b/examples/camel-example-cxf-osgi/pom.xml index fecb435..06723ae 100644 --- a/examples/camel-example-cxf-osgi/pom.xml +++ b/examples/camel-example-cxf-osgi/pom.xml @@ -92,15 +92,24 @@ <version>${cxf-version}</version> <scope>test</scope> </dependency> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>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> + <!-- test --> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cxf-osgi/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-osgi/src/test/resources/log4j.properties b/examples/camel-example-cxf-osgi/src/test/resources/log4j.properties deleted file mode 100644 index 8e97c07..0000000 --- a/examples/camel-example-cxf-osgi/src/test/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 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=[%10.10t] %-30.30c{1} %-5p %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cxf-osgi/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-osgi/src/test/resources/log4j2.properties b/examples/camel-example-cxf-osgi/src/test/resources/log4j2.properties new file mode 100644 index 0000000..699897b --- /dev/null +++ b/examples/camel-example-cxf-osgi/src/test/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 = [%10.10t] %-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-cxf-proxy/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml index 721843a..3c8f11d 100755 --- a/examples/camel-example-cxf-proxy/pom.xml +++ b/examples/camel-example-cxf-proxy/pom.xml @@ -76,15 +76,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-cxf-proxy/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-proxy/src/main/resources/log4j.properties b/examples/camel-example-cxf-proxy/src/main/resources/log4j.properties deleted file mode 100755 index e255393..0000000 --- a/examples/camel-example-cxf-proxy/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 - -# Camel logging -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.cxf=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-cxf-proxy/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-proxy/src/main/resources/log4j2.properties b/examples/camel-example-cxf-proxy/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cxf-proxy/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-cxf-tomcat/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-tomcat/pom.xml b/examples/camel-example-cxf-tomcat/pom.xml index 27ccc53..8c75caf 100755 --- a/examples/camel-example-cxf-tomcat/pom.xml +++ b/examples/camel-example-cxf-tomcat/pom.xml @@ -96,16 +96,24 @@ <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> + </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cxf-tomcat/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-tomcat/src/main/resources/log4j.properties b/examples/camel-example-cxf-tomcat/src/main/resources/log4j.properties deleted file mode 100755 index 4b2d528..0000000 --- a/examples/camel-example-cxf-tomcat/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.cxf=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-cxf-tomcat/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf-tomcat/src/main/resources/log4j2.properties b/examples/camel-example-cxf-tomcat/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-cxf-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-cxf/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml index 9c251de..889389e 100644 --- a/examples/camel-example-cxf/pom.xml +++ b/examples/camel-example-cxf/pom.xml @@ -129,15 +129,22 @@ <groupId>xerces</groupId> <artifactId>xercesImpl</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> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/examples/camel-example-cxf/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf/src/main/resources/log4j.properties b/examples/camel-example-cxf/src/main/resources/log4j.properties deleted file mode 100644 index 998f69e..0000000 --- a/examples/camel-example-cxf/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 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-cxf/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-cxf/src/main/resources/log4j2.properties b/examples/camel-example-cxf/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/examples/camel-example-cxf/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-etl/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-etl/pom.xml b/examples/camel-example-etl/pom.xml index 1873eb1..2252cf8 100644 --- a/examples/camel-example-etl/pom.xml +++ b/examples/camel-example-etl/pom.xml @@ -63,11 +63,22 @@ <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> </dependency> - - <!-- lets use log4j --> + + <!-- 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-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-etl/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-etl/src/main/resources/log4j.properties b/examples/camel-example-etl/src/main/resources/log4j.properties deleted file mode 100644 index 54d84e7..0000000 --- a/examples/camel-example-etl/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.file=DEBUG -#log4j.logger.org.apache.camel.component.jpa=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-etl/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/examples/camel-example-etl/src/main/resources/log4j2.properties b/examples/camel-example-etl/src/main/resources/log4j2.properties new file mode 100644 index 0000000..7dfcc1f --- /dev/null +++ b/examples/camel-example-etl/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-ftp/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-ftp/pom.xml b/examples/camel-example-ftp/pom.xml index 66be13c..bad6f18 100644 --- a/examples/camel-example-ftp/pom.xml +++ b/examples/camel-example-ftp/pom.xml @@ -41,15 +41,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-ftp</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>