http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bean-validator/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml index 984edfa..f65aa46 100644 --- a/components/camel-bean-validator/pom.xml +++ b/components/camel-bean-validator/pom.xml @@ -87,8 +87,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bean-validator/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-bean-validator/src/test/resources/log4j.properties b/components/camel-bean-validator/src/test/resources/log4j.properties deleted file mode 100644 index 3b88c20..0000000 --- a/components/camel-bean-validator/src/test/resources/log4j.properties +++ /dev/null @@ -1,37 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ - -# -# The logging properties used for eclipse testing, We want to see debug output on the console. -# -log4j.rootLogger=INFO, file - -log4j.logger.org.springframework=WARN -#log4j.logger.org.apache.camel.component.bean.validator=DEBUG -#log4j.logger.org.hibernate.validator=DEBUG - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -#log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n -log4j.appender.file.file=target/camel-bean-validator-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bean-validator/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-bean-validator/src/test/resources/log4j2.properties b/components/camel-bean-validator/src/test/resources/log4j2.properties new file mode 100644 index 0000000..aa90b00 --- /dev/null +++ b/components/camel-bean-validator/src/test/resources/log4j2.properties @@ -0,0 +1,30 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-bean-validator-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1} - %m %n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +logger.springframework.name = org.springframework +logger.springframework.level = WARN +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-beanio/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-beanio/pom.xml b/components/camel-beanio/pom.xml index c7f94a7..db95c76 100644 --- a/components/camel-beanio/pom.xml +++ b/components/camel-beanio/pom.xml @@ -61,8 +61,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-beanio/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-beanio/src/test/resources/log4j.properties b/components/camel-beanio/src/test/resources/log4j.properties deleted file mode 100644 index d44f242..0000000 --- a/components/camel-beanio/src/test/resources/log4j.properties +++ /dev/null @@ -1,35 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, file - -#log4j.logger.org.apache.camel.dataformat.beanio=DEBUG - -# CONSOLE appender not used by default -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d %-5p %c{1} - %m %n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n -log4j.appender.file.file=target/camel-beanio-test.log - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-beanio/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-beanio/src/test/resources/log4j2.properties b/components/camel-beanio/src/test/resources/log4j2.properties new file mode 100644 index 0000000..32248a7 --- /dev/null +++ b/components/camel-beanio/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## 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 %-5p %c{1} - %m %n +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-beanio-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1} - %m %n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-beanstalk/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/pom.xml b/components/camel-beanstalk/pom.xml index ef9ff55..ff62fc2 100644 --- a/components/camel-beanstalk/pom.xml +++ b/components/camel-beanstalk/pom.xml @@ -66,8 +66,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-beanstalk/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/resources/log4j.properties b/components/camel-beanstalk/src/test/resources/log4j.properties deleted file mode 100644 index d6a09a1..0000000 --- a/components/camel-beanstalk/src/test/resources/log4j.properties +++ /dev/null @@ -1,35 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, file - -#log4j.logger.org.apache.camel.dataformat.beanio=DEBUG - -# CONSOLE appender not used by default -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d %-5p %c{1} - %m %n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n -log4j.appender.file.file=target/camel-beanstalk-test.log - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-beanstalk/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/resources/log4j2.properties b/components/camel-beanstalk/src/test/resources/log4j2.properties new file mode 100644 index 0000000..fcfbadc --- /dev/null +++ b/components/camel-beanstalk/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## 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 %-5p %c{1} - %m %n +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-beanstalk-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1} - %m %n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bindy/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml index 8b136c6..ffc1c8f 100755 --- a/components/camel-bindy/pom.xml +++ b/components/camel-bindy/pom.xml @@ -73,8 +73,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bindy/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/resources/log4j.properties b/components/camel-bindy/src/test/resources/log4j.properties deleted file mode 100755 index b537961..0000000 --- a/components/camel-bindy/src/test/resources/log4j.properties +++ /dev/null @@ -1,35 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=info, file - -# CONSOLE appender not used by default -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d %-5p %c{1} - %m %n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n -log4j.appender.file.file=target/camel-bindy-test.log - -# debug logging for Camel -log4j.logger.org.apache.camel.dataformat.bindy=info http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bindy/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/resources/log4j2.properties b/components/camel-bindy/src/test/resources/log4j2.properties new file mode 100644 index 0000000..a7be984 --- /dev/null +++ b/components/camel-bindy/src/test/resources/log4j2.properties @@ -0,0 +1,30 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d %-5p %c{1} - %m %n +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-bindy-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1} - %m %n +logger.bindy.name = org.apache.camel.dataformat.bindy +logger.bindy.level = info +rootLogger.level = info +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-blueprint/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml index b5f7a83..fa49413 100644 --- a/components/camel-blueprint/pom.xml +++ b/components/camel-blueprint/pom.xml @@ -98,9 +98,19 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-boon/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-boon/pom.xml b/components/camel-boon/pom.xml index f2fd97e..9a6e4ad 100644 --- a/components/camel-boon/pom.xml +++ b/components/camel-boon/pom.xml @@ -54,10 +54,20 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-boon/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-boon/src/test/resources/log4j.properties b/components/camel-boon/src/test/resources/log4j.properties deleted file mode 100644 index e9a9e11..0000000 --- a/components/camel-boon/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, file - -# uncomment this to turn on debug of 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=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-boon-test.log -log4j.appender.file.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-boon/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-boon/src/test/resources/log4j2.properties b/components/camel-boon/src/test/resources/log4j2.properties new file mode 100644 index 0000000..ff34f92 --- /dev/null +++ b/components/camel-boon/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-boon-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-box/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-box/pom.xml b/components/camel-box/pom.xml index d021354..283d7fa 100644 --- a/components/camel-box/pom.xml +++ b/components/camel-box/pom.xml @@ -158,14 +158,20 @@ <scope>provided</scope> </dependency> - <!-- logging --> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-box/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-box/src/test/resources/log4j.properties b/components/camel-box/src/test/resources/log4j.properties deleted file mode 100644 index 59ebc7b..0000000 --- a/components/camel-box/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ - -# -# The logging properties used for testing. -# -log4j.rootLogger=INFO, file - -# uncomment the following to enable camel debugging -#log4j.logger.org.apache.camel.component.salesforce=DEBUG - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -#log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-box-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-box/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-box/src/test/resources/log4j2.properties b/components/camel-box/src/test/resources/log4j2.properties new file mode 100644 index 0000000..438063a --- /dev/null +++ b/components/camel-box/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-box-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-braintree/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml index 2543346..2c3cf60 100644 --- a/components/camel-braintree/pom.xml +++ b/components/camel-braintree/pom.xml @@ -71,15 +71,20 @@ <artifactId>slf4j-api</artifactId> </dependency> - <!-- testing - logging --> + <!-- testing - logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-braintree/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-braintree/src/test/resources/log4j.properties b/components/camel-braintree/src/test/resources/log4j.properties deleted file mode 100644 index 9e38447..0000000 --- a/components/camel-braintree/src/test/resources/log4j.properties +++ /dev/null @@ -1,37 +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, file - -# uncomment the following line to turn on Camel debugging -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.component.braintree=TRACE - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n -log4j.appender.file.file=target/camel-braintree-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-braintree/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-braintree/src/test/resources/log4j2.properties b/components/camel-braintree/src/test/resources/log4j2.properties new file mode 100644 index 0000000..363bc1a --- /dev/null +++ b/components/camel-braintree/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-braintree-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1} - %m %n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cache/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cache/pom.xml b/components/camel-cache/pom.xml index 7e753bb..99ae3e2 100755 --- a/components/camel-cache/pom.xml +++ b/components/camel-cache/pom.xml @@ -77,9 +77,19 @@ <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cache/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-cache/src/test/resources/log4j.properties b/components/camel-cache/src/test/resources/log4j.properties deleted file mode 100755 index a790609..0000000 --- a/components/camel-cache/src/test/resources/log4j.properties +++ /dev/null @@ -1,38 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ - -# -# The logging properties used for eclipse testing, We want to see debug output on the console. -# -log4j.rootLogger=INFO, file - -# uncomment the following to enable camel debugging -log4j.logger.org.apache.camel.component.cache=INFO -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.commons.net=TRACE - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -#log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-cache-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cache/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-cache/src/test/resources/log4j2.properties b/components/camel-cache/src/test/resources/log4j2.properties new file mode 100644 index 0000000..bbe3ce6 --- /dev/null +++ b/components/camel-cache/src/test/resources/log4j2.properties @@ -0,0 +1,30 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-cache-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +logger.cache.name = org.apache.camel.component.cache +logger.cache.level = INFO +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cassandraql/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml index 5be213d..9e7f9e4 100644 --- a/components/camel-cassandraql/pom.xml +++ b/components/camel-cassandraql/pom.xml @@ -55,15 +55,20 @@ <version>${cassandra-driver-version}</version> </dependency> - <!-- logging --> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cassandraql/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/resources/log4j.properties b/components/camel-cassandraql/src/test/resources/log4j.properties deleted file mode 100644 index 792dd13..0000000 --- a/components/camel-cassandraql/src/test/resources/log4j.properties +++ /dev/null @@ -1,39 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests -# -log4j.rootLogger=INFO, file - -# uncomment this to turn on debug of camel -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.component.cassandra=TRACE -#log4j.logger.org.apache.cassandra=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 - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-cassandraql-test.log -log4j.appender.file.append=true - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cassandraql/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/resources/log4j2.properties b/components/camel-cassandraql/src/test/resources/log4j2.properties new file mode 100644 index 0000000..7601e5f --- /dev/null +++ b/components/camel-cassandraql/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-cassandraql-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +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.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-castor/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml index c928fc9..1719d67 100644 --- a/components/camel-castor/pom.xml +++ b/components/camel-castor/pom.xml @@ -51,10 +51,20 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-castor/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-castor/src/test/resources/log4j.properties b/components/camel-castor/src/test/resources/log4j.properties deleted file mode 100644 index 8ad07b2..0000000 --- a/components/camel-castor/src/test/resources/log4j.properties +++ /dev/null @@ -1,37 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, out - -log4j.logger.org.apache.activemq.spring=WARN - -# 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 - -# File appender -log4j.appender.out=org.apache.log4j.FileAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.out.file=target/camel-castor-test.log -log4j.appender.out.append=true - -#log4j.logger.org.apache.camel=DEBUG http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-castor/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-castor/src/test/resources/log4j2.properties b/components/camel-castor/src/test/resources/log4j2.properties new file mode 100644 index 0000000..0e9b183 --- /dev/null +++ b/components/camel-castor/src/test/resources/log4j2.properties @@ -0,0 +1,30 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.out.type = File +appender.out.name = out +appender.out.fileName = target/camel-castor-test.log +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +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.spring.name = org.apache.activemq.spring +logger.spring.level = WARN +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index f47c765..d137415 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -133,21 +133,25 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + <version>${slf4j-version}</version> <scope>test</scope> </dependency> - + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jul-to-slf4j</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogEventVerifier.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogEventVerifier.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogEventVerifier.java index 497cd40..7505271 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogEventVerifier.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogEventVerifier.java @@ -20,17 +20,16 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.log4j.spi.LoggingEvent; public class LogEventVerifier extends LogVerifier { + private final List<LogEvent> events = new ArrayList<>(); - private List<LogEvent> events = new ArrayList<>(); - - protected void append(LoggingEvent event) { + @Override + protected void doAppend(org.apache.logging.log4j.core.LogEvent event) { events.add(new LogEvent( event.getLevel().toString(), event.getLoggerName(), - event.getRenderedMessage())); + event.getMessage().getFormattedMessage())); } public List<LogEvent> getEvents() { http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogVerifier.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogVerifier.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogVerifier.java index 237c82a..a154eed 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogVerifier.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/rule/LogVerifier.java @@ -20,10 +20,13 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.log4j.Appender; -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.LogManager; -import org.apache.log4j.spi.LoggingEvent; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.appender.AbstractAppender; +import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.layout.PatternLayout; import org.junit.rules.Verifier; import org.junit.runner.Description; import org.junit.runners.model.Statement; @@ -35,25 +38,11 @@ public class LogVerifier extends Verifier { private final List<String> messages = new ArrayList<>(); public LogVerifier() { - this.appender = new AppenderSkeleton() { - @Override - public void close() { - } - - @Override - public boolean requiresLayout() { - return false; - } - - @Override - protected void append(LoggingEvent event) { - LogVerifier.this.append(event); - } - }; + appender = newAppender(); } - protected void append(LoggingEvent event) { - messages.add(event.getRenderedMessage()); + protected void doAppend(org.apache.logging.log4j.core.LogEvent event) { + messages.add(event.getMessage().getFormattedMessage()); } public List<String> getMessages() { @@ -65,15 +54,45 @@ public class LogVerifier extends Verifier { return new Statement() { @Override public void evaluate() throws Throwable { - LogManager.getRootLogger().addAppender(appender); try { base.evaluate(); verify(); } finally { - LogManager.getRootLogger().removeAppender(appender); - appender.close(); } } }; } + + private class LogAppender extends AbstractAppender { + public LogAppender(String name) { + super( + name, + null, + PatternLayout.newBuilder() + .withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN) + .build() + ); + } + + @Override + public void append(org.apache.logging.log4j.core.LogEvent event) { + doAppend(event); + } + } + + private Appender newAppender() { + final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); + final Configuration config = ctx.getConfiguration(); + + LogAppender appender = new LogAppender("cdi-rule"); + appender.start(); + + config.addAppender(appender); + config.getRootLogger().removeAppender("cdi-rule"); + config.getRootLogger().addAppender(appender, Level.TRACE, null); + + ctx.updateLoggers(); + + return appender; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerLoggingTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerLoggingTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerLoggingTest.java index 8517ad4..b097338 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerLoggingTest.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerLoggingTest.java @@ -18,7 +18,6 @@ package org.apache.camel.cdi.test; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; - import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Named; http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerPolicyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerPolicyTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerPolicyTest.java index caf162c..dc532b4 100644 --- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerPolicyTest.java +++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/XmlErrorHandlerPolicyTest.java @@ -18,7 +18,6 @@ package org.apache.camel.cdi.test; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; - import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.inject.Named; @@ -31,14 +30,12 @@ import org.apache.camel.cdi.ImportResource; import org.apache.camel.cdi.Uri; import org.apache.camel.cdi.rule.LogEventVerifier; import org.apache.camel.component.mock.MockEndpoint; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; - import org.junit.ClassRule; import org.junit.Test; import org.junit.rules.TestRule; http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cdi/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/test/resources/log4j.properties b/components/camel-cdi/src/test/resources/log4j.properties deleted file mode 100644 index 712a8a5..0000000 --- a/components/camel-cdi/src/test/resources/log4j.properties +++ /dev/null @@ -1,37 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ - -# -# The logging properties used for eclipse testing, We want to see debug output on the console. -# -log4j.rootLogger=INFO, file - -#log4j.logger.org.jboss.weld=DEBUG -#log4j.logger.org.apache.webbeans=DEBUG -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.cdi=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=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n -log4j.appender.file.file=target/camel-cdi-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cdi/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/test/resources/log4j2.properties b/components/camel-cdi/src/test/resources/log4j2.properties new file mode 100644 index 0000000..a03e6e3 --- /dev/null +++ b/components/camel-cdi/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-cdi-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1} - %m %n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-chronicle/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-chronicle/pom.xml b/components/camel-chronicle/pom.xml index 814a1b6..c37cc49 100644 --- a/components/camel-chronicle/pom.xml +++ b/components/camel-chronicle/pom.xml @@ -54,8 +54,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-chronicle/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-chronicle/src/test/resources/log4j.properties b/components/camel-chronicle/src/test/resources/log4j.properties deleted file mode 100644 index 2317890..0000000 --- a/components/camel-chronicle/src/test/resources/log4j.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# The logging properties used -# -log4j.rootLogger=INFO, file - -# uncomment the following line to turn on Camel debugging -log4j.logger.org.apache.camel.component.chronicle=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=%d{HH:mm:ss.SSS} [%-15.15t] %-30.30c{1} %-5p %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n -log4j.appender.file.file=target/camel-chronicle-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-chronicle/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-chronicle/src/test/resources/log4j2.properties b/components/camel-chronicle/src/test/resources/log4j2.properties new file mode 100644 index 0000000..697eb21 --- /dev/null +++ b/components/camel-chronicle/src/test/resources/log4j2.properties @@ -0,0 +1,30 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-chronicle-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1} - %m %n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d{HH:mm:ss.SSS} [%-15.15t] %-30.30c{1} %-5p %m%n +logger.chronicle.name = org.apache.camel.component.chronicle +logger.chronicle.level = DEBUG +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-chunk/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-chunk/pom.xml b/components/camel-chunk/pom.xml index 152b6ec..4fc5d39 100644 --- a/components/camel-chunk/pom.xml +++ b/components/camel-chunk/pom.xml @@ -57,9 +57,20 @@ <artifactId>camel-test</artifactId> <scope>test</scope> </dependency> + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-chunk/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-chunk/src/test/resources/log4j.properties b/components/camel-chunk/src/test/resources/log4j.properties deleted file mode 100644 index aa6b147..0000000 --- a/components/camel-chunk/src/test/resources/log4j.properties +++ /dev/null @@ -1,37 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ - -# -# The logging properties used for testing. -# -log4j.rootLogger=INFO, file - -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.component.chunk=DEBUG - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-chunk-test.log -log4j.appender.file.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-chunk/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-chunk/src/test/resources/log4j2.properties b/components/camel-chunk/src/test/resources/log4j2.properties new file mode 100644 index 0000000..bf3a688 --- /dev/null +++ b/components/camel-chunk/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-chunk-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cm-sms/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml index d990119..875dc96 100644 --- a/components/camel-cm-sms/pom.xml +++ b/components/camel-cm-sms/pom.xml @@ -88,8 +88,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cm-sms/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-cm-sms/src/main/resources/log4j.properties b/components/camel-cm-sms/src/main/resources/log4j.properties deleted file mode 100644 index 0ada021..0000000 --- a/components/camel-cm-sms/src/main/resources/log4j.properties +++ /dev/null @@ -1,41 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ - -# -# The logging properties used for testing -# -log4j.rootLogger=INFO, file - -# uncomment the following to enable camel debugging -#log4j.logger.org.apache.camel.component.cm=TRACE -#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 -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-cm-sms-test.log -# MDC -#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cm-sms/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-cm-sms/src/main/resources/log4j2.properties b/components/camel-cm-sms/src/main/resources/log4j2.properties new file mode 100644 index 0000000..1c819f2 --- /dev/null +++ b/components/camel-cm-sms/src/main/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-cm-sms-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cmis/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml index 18ad327..2821c20 100644 --- a/components/camel-cmis/pom.xml +++ b/components/camel-cmis/pom.xml @@ -82,9 +82,20 @@ <version>${jetty-version}</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cmis/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-cmis/src/test/resources/log4j.properties b/components/camel-cmis/src/test/resources/log4j.properties deleted file mode 100644 index e2de052..0000000 --- a/components/camel-cmis/src/test/resources/log4j.properties +++ /dev/null @@ -1,37 +0,0 @@ -## --------------------------------------------------------------------------- -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## --------------------------------------------------------------------------- - -# -# The logging properties used during tests.. -# -log4j.rootLogger=INFO, file - -#log4j.logger.org.apache.camel.component.cmis=DEBUG -#log4j.logger.org.apache.camel=INFO - - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.file.file=target/camel-cmis-test.log -log4j.appender.file.append=false http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-cmis/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-cmis/src/test/resources/log4j2.properties b/components/camel-cmis/src/test/resources/log4j2.properties new file mode 100644 index 0000000..dcfb0a9 --- /dev/null +++ b/components/camel-cmis/src/test/resources/log4j2.properties @@ -0,0 +1,28 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-cmis-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-coap/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml index a801a1f..3f79c8a 100644 --- a/components/camel-coap/pom.xml +++ b/components/camel-coap/pom.xml @@ -46,19 +46,20 @@ <version>${californium-version}</version> </dependency> - <!-- logging --> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-coap/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-coap/src/test/resources/log4j.properties b/components/camel-coap/src/test/resources/log4j.properties deleted file mode 100644 index 4848ee7..0000000 --- a/components/camel-coap/src/test/resources/log4j.properties +++ /dev/null @@ -1,41 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ - -# -# The logging properties used for testing. -# -log4j.rootLogger=INFO, file - -# uncomment the following to enable camel debugging -#log4j.logger.org.apache.camel.component.coap=TRACE - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camelexchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - -# File appender -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.file=target/camel-coap-test.log -log4j.appender.file.append=true -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n -
