http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-itest-performance/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tests/camel-itest-performance/src/test/resources/log4j2.properties b/tests/camel-itest-performance/src/test/resources/log4j2.properties new file mode 100644 index 0000000..d6bca2f --- /dev/null +++ b/tests/camel-itest-performance/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.out.type = File +appender.out.name = out +appender.out.fileName = target/camel-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 +rootLogger.level = INFO +rootLogger.appenderRef.stdout.ref = stdout
http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-itest-standalone/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-standalone/pom.xml b/tests/camel-itest-standalone/pom.xml index cc6ff3f..e615da8 100644 --- a/tests/camel-itest-standalone/pom.xml +++ b/tests/camel-itest-standalone/pom.xml @@ -40,14 +40,26 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <!-- logging --> + <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> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-itest-standalone/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tests/camel-itest-standalone/src/test/resources/log4j.properties b/tests/camel-itest-standalone/src/test/resources/log4j.properties deleted file mode 100644 index 086be7a..0000000 --- a/tests/camel-itest-standalone/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 for eclipse testing, We want to see debug output on the console. -# -log4j.rootLogger=INFO, file - -#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 - -# 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-itest-standalone-test.log -log4j.appender.file.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-itest-standalone/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tests/camel-itest-standalone/src/test/resources/log4j2.properties b/tests/camel-itest-standalone/src/test/resources/log4j2.properties new file mode 100644 index 0000000..f84ee7c --- /dev/null +++ b/tests/camel-itest-standalone/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-itest-standalone-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/tests/camel-itest/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index a8d5dfd..36afc78 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -218,11 +218,6 @@ <version>${mina2-version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> <!-- mocking ftp server --> <dependency> @@ -347,12 +342,30 @@ </exclusion> </exclusions> </dependency> + + <!-- logging --> + <dependency> + <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> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> @@ -421,6 +434,9 @@ <phase>generate-sources</phase> <configuration> <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> + <additionalJvmArgs> + -Dlog4j.configurationFile=${project.basedir}/src/test/resources/log4j2.properties + </additionalJvmArgs> <wsdlOptions> <wsdlOption> <frontEnd>jaxws21</frontEnd> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-itest/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/log4j.properties b/tests/camel-itest/src/test/resources/log4j.properties deleted file mode 100644 index c8b19e6..0000000 --- a/tests/camel-itest/src/test/resources/log4j.properties +++ /dev/null @@ -1,45 +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.springframework=WARN -#log4j.logger.org.apache.activemq=WARN -#log4j.logger.org.apache.camel=TRACE -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.component.netty=DEBUG -#log4j.logger.org.apache.camel.component.netty.http.NettyHttpProducer=TRACE -#log4j.logger.org.apache.camel.processor.DefaultErrorHandler=TRACE -#log4j.logger.org.apache.camel.component.jetty=TRACE -#log4j.logger.org.apache.camel.processor.Pipeline=TRACE -#log4j.logger.org.apache.camel.processor.MulticastProcessor=TRACE - -# 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-itest-test.log -log4j.appender.file.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-itest/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/resources/log4j2.properties b/tests/camel-itest/src/test/resources/log4j2.properties new file mode 100644 index 0000000..e3cebcb --- /dev/null +++ b/tests/camel-itest/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-itest-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/tests/camel-partial-classpath-test/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-partial-classpath-test/pom.xml b/tests/camel-partial-classpath-test/pom.xml index c0f4938..14fb896 100644 --- a/tests/camel-partial-classpath-test/pom.xml +++ b/tests/camel-partial-classpath-test/pom.xml @@ -61,14 +61,26 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <!-- logging --> + <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> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-partial-classpath-test/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tests/camel-partial-classpath-test/src/test/resources/log4j.properties b/tests/camel-partial-classpath-test/src/test/resources/log4j.properties deleted file mode 100644 index 4397e7a..0000000 --- a/tests/camel-partial-classpath-test/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 during tests.. -# -log4j.rootLogger=INFO, out - -# Use the following line to turn on debug output for camel -#log4j.logger.org.apache.camel=DEBUG - -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-test.log -log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-partial-classpath-test/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tests/camel-partial-classpath-test/src/test/resources/log4j2.properties b/tests/camel-partial-classpath-test/src/test/resources/log4j2.properties new file mode 100644 index 0000000..6b8d116 --- /dev/null +++ b/tests/camel-partial-classpath-test/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-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/tests/camel-performance/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml index 5d85aec..f8d4caf 100644 --- a/tests/camel-performance/pom.xml +++ b/tests/camel-performance/pom.xml @@ -52,11 +52,28 @@ <artifactId>camel-test-blueprint</artifactId> <scope>test</scope> </dependency> + + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <scope>test</scscope> + </dependency> <dependency> <groupId>commons-io</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-performance/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tests/camel-performance/src/test/resources/log4j.properties b/tests/camel-performance/src/test/resources/log4j.properties deleted file mode 100644 index ea28d64..0000000 --- a/tests/camel-performance/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=WARN, file, out - -# uncomment the following to enable camel debugging -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.test.perf=INFO -#log4j.logger.org.apache.cxf=DEBUG -#log4j.logger.org.apache.camel.component.cxf=DEBUG -#log4j.logger.org.apache.ws=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 %-5p %c{1}.%M - %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-performance-test.log -log4j.appender.file.append=true -log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1}.%M - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-performance/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tests/camel-performance/src/test/resources/log4j2.properties b/tests/camel-performance/src/test/resources/log4j2.properties new file mode 100644 index 0000000..1c28b5d --- /dev/null +++ b/tests/camel-performance/src/test/resources/log4j2.properties @@ -0,0 +1,29 @@ +## --------------------------------------------------------------------------- +## 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-performance-test.log +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d %-5p %c{1}.%M - %m%n +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = %d %-5p %c{1}.%M - %m%n +rootLogger.level = WARN +rootLogger.appenderRef.file.ref = file +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-typeconverterscan-test/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-typeconverterscan-test/pom.xml b/tests/camel-typeconverterscan-test/pom.xml index 82c8e04..079584f 100644 --- a/tests/camel-typeconverterscan-test/pom.xml +++ b/tests/camel-typeconverterscan-test/pom.xml @@ -47,14 +47,26 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <!-- logging --> + <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> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-typeconverterscan-test/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tests/camel-typeconverterscan-test/src/test/resources/log4j.properties b/tests/camel-typeconverterscan-test/src/test/resources/log4j.properties deleted file mode 100644 index 2781dbb..0000000 --- a/tests/camel-typeconverterscan-test/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, out - -# Use the following line to turn on debug output for camel -#log4j.logger.org.apache.camel=DEBUG - -l# 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-test.log -log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tests/camel-typeconverterscan-test/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tests/camel-typeconverterscan-test/src/test/resources/log4j2.properties b/tests/camel-typeconverterscan-test/src/test/resources/log4j2.properties new file mode 100644 index 0000000..6641df9 --- /dev/null +++ b/tests/camel-typeconverterscan-test/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.out.type = File +appender.out.name = out +appender.out.fileName = target/camel-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 +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/apt/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml index 33803c7..72ff512 100644 --- a/tooling/apt/pom.xml +++ b/tooling/apt/pom.xml @@ -35,15 +35,29 @@ <dependencies> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>spi-annotations</artifactId> <version>${project.version}</version> </dependency> + <!-- logging --> + <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.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <!-- testing --> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/apt/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/apt/src/test/resources/log4j2.properties b/tooling/apt/src/test/resources/log4j2.properties new file mode 100644 index 0000000..b91a581 --- /dev/null +++ b/tooling/apt/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/tooling-apt-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/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml index d8b5883..f8e340f 100644 --- a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml @@ -104,16 +104,24 @@ <!-- 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> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <scope>test</scope> </dependency> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/log4j.properties deleted file mode 100644 index 3095316..0000000 --- a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/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 -# -log4j.rootLogger=INFO, out - -# uncomment the following line to turn on Camel debugging -#log4j.logger.org.apache.camel=DEBUG - -# uncomment the following line to turn on ActiveMQ debugging -#log4j.logger.org.apache.activemq=DEBUG - -log4j.logger.org.springframework=WARN - - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/log4j2.properties new file mode 100644 index 0000000..f493946 --- /dev/null +++ b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/src/main/resources/log4j2.properties @@ -0,0 +1,27 @@ +## --------------------------------------------------------------------------- +## 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 + +logger.springframework.name = org.springframework +logger.springframework.level = WARN + +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml index b1d0c88..009048a 100644 --- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml +++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml @@ -74,23 +74,21 @@ <classifier>javadoc</classifier> <scope>provided</scope> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j-version}</version> + <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/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/log4j.properties b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/log4j.properties deleted file mode 100644 index a937abd..0000000 --- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ -# -# The logging properties used -# -log4j.rootLogger=INFO, out - -# uncomment the following line to 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 -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/log4j2.properties b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/src/test/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/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 = [%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/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml index 52f3fe1..5b82c89 100644 --- a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml @@ -62,14 +62,21 @@ <artifactId>camel-test-blueprint</artifactId> <scope>test</scope> </dependency> + + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>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/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j.properties deleted file mode 100644 index 330a162..0000000 --- a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j.properties +++ /dev/null @@ -1,34 +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, out - -#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 - -# 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-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/src/main/resources/log4j2.properties new file mode 100644 index 0000000..a41caa0 --- /dev/null +++ b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/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-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.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml index a6bd22d..b8491e9 100644 --- a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml @@ -61,15 +61,21 @@ <artifactId>camel-cdi</artifactId> </dependency> + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> <scope>runtime</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>runtime</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/resources/log4j.properties deleted file mode 100644 index a937abd..0000000 --- a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ -# -# The logging properties used -# -log4j.rootLogger=INFO, out - -# uncomment the following line to 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 -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/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/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml index 520302c..738e7c3 100644 --- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml @@ -45,23 +45,21 @@ <artifactId>apt</artifactId> <version>${camel-version}</version> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j-version}</version> + <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/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j.properties deleted file mode 100644 index a937abd..0000000 --- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ -# -# The logging properties used -# -log4j.rootLogger=INFO, out - -# uncomment the following line to 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 -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j2.properties b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/src/test/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/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 = [%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/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml index f956cca..d4633d5 100644 --- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml @@ -38,23 +38,21 @@ <artifactId>camel-core</artifactId> <version>${camel-version}</version> </dependency> - + <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j-version}</version> + <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/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties deleted file mode 100644 index a937abd..0000000 --- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ -# -# The logging properties used -# -log4j.rootLogger=INFO, out - -# uncomment the following line to 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 -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j2.properties b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/src/test/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/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 = [%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/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml index e1dc55f..ff202e5 100644 --- a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml @@ -60,19 +60,22 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jetty</artifactId> </dependency> - + <!-- 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> <!-- testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j.properties deleted file mode 100644 index a937abd..0000000 --- a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ -# -# The logging properties used -# -log4j.rootLogger=INFO, out - -# uncomment the following line to 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 -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/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/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml index 7f0a325..a40183e 100644 --- a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml @@ -53,16 +53,19 @@ <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</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>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/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/resources/log4j.properties deleted file mode 100644 index a937abd..0000000 --- a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ -# -# The logging properties used -# -log4j.rootLogger=INFO, out - -# uncomment the following line to 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 -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/resources/log4j2.properties new file mode 100644 index 0000000..93d8e72 --- /dev/null +++ b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/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/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml index 3545e05..aade603 100644 --- a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml @@ -68,16 +68,19 @@ <!-- logging --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</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>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/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j.properties deleted file mode 100644 index f257e58..0000000 --- a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j.properties +++ /dev/null @@ -1,32 +0,0 @@ -## ------------------------------------------------------------------------ -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## ------------------------------------------------------------------------ -# -# The logging properties used -# -log4j.rootLogger=INFO, out - -# uncomment the following line to turn on Camel debugging -#log4j.logger.org.apache.camel=DEBUG - -log4j.logger.org.springframework=WARN - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j2.properties new file mode 100644 index 0000000..58e02d2 --- /dev/null +++ b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/src/main/resources/log4j2.properties @@ -0,0 +1,25 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n +logger.springframework.name = org.springframework +logger.springframework.level = WARN +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml index d030193..61c0389 100644 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml @@ -55,24 +55,30 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-scr</artifactId> </dependency> - - <!-- Testing --> + + <!-- logging --> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</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> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/resources/log4j.properties deleted file mode 100644 index 330a162..0000000 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/src/test/resources/log4j.properties +++ /dev/null @@ -1,34 +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, out - -#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 - -# 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-test.log