http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java index f654aa6..cd49eb4 100644 --- a/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/ResourceHelperTest.java @@ -37,7 +37,7 @@ public class ResourceHelperTest extends TestSupport { CamelContext context = new DefaultCamelContext(); context.start(); - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(context, "file:src/test/resources/log4j.properties"); + InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(context, "file:src/test/resources/log4j2.properties"); assertNotNull(is); String text = context.getTypeConverter().convertTo(String.class, is); @@ -53,9 +53,9 @@ public class ResourceHelperTest extends TestSupport { context.start(); createDirectory("target/my space"); - FileUtil.copyFile(new File("src/test/resources/log4j.properties"), new File("target/my space/log4j.properties")); + FileUtil.copyFile(new File("src/test/resources/log4j2.properties"), new File("target/my space/log4j2.properties")); - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(context, "file:target/my%20space/log4j.properties"); + InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(context, "file:target/my%20space/log4j2.properties"); assertNotNull(is); String text = context.getTypeConverter().convertTo(String.class, is); @@ -70,7 +70,7 @@ public class ResourceHelperTest extends TestSupport { CamelContext context = new DefaultCamelContext(); context.start(); - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(context, "classpath:log4j.properties"); + InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(context, "classpath:log4j2.properties"); assertNotNull(is); String text = context.getTypeConverter().convertTo(String.class, is); @@ -102,7 +102,7 @@ public class ResourceHelperTest extends TestSupport { CamelContext context = new DefaultCamelContext(); context.start(); - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(context, "log4j.properties"); + InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(context, "log4j2.properties"); assertNotNull(is); String text = context.getTypeConverter().convertTo(String.class, is); @@ -145,7 +145,7 @@ public class ResourceHelperTest extends TestSupport { CamelContext context = new DefaultCamelContext(); context.start(); - URL url = ResourceHelper.resolveMandatoryResourceAsUrl(context.getClassResolver(), "file:src/test/resources/log4j.properties"); + URL url = ResourceHelper.resolveMandatoryResourceAsUrl(context.getClassResolver(), "file:src/test/resources/log4j2.properties"); assertNotNull(url); String text = context.getTypeConverter().convertTo(String.class, url); @@ -159,7 +159,7 @@ public class ResourceHelperTest extends TestSupport { CamelContext context = new DefaultCamelContext(); context.start(); - URL url = ResourceHelper.resolveMandatoryResourceAsUrl(context.getClassResolver(), "classpath:log4j.properties"); + URL url = ResourceHelper.resolveMandatoryResourceAsUrl(context.getClassResolver(), "classpath:log4j2.properties"); assertNotNull(url); String text = context.getTypeConverter().convertTo(String.class, url);
http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/camel-core/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/camel-core/src/test/resources/log4j.properties b/camel-core/src/test/resources/log4j.properties deleted file mode 100644 index f8ecded..0000000 --- a/camel-core/src/test/resources/log4j.properties +++ /dev/null @@ -1,80 +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.customlogger=TRACE, file2 - -#log4j.logger.org.apache.camel.impl.converter=WARN -#log4j.logger.org.apache.camel.management=DEBUG -#log4j.logger.org.apache.camel.impl.DefaultPackageScanClassResolver=WARN -#log4j.logger.org.apache.camel.impl.converter.DefaultTypeConverter=TRACE -#log4j.logger.org.apache.camel.impl.converter=DEBUG - -#log4j.logger.org.apache.camel=DEBUG -#log4j.logger.org.apache.camel.builder=TRACE -#log4j.logger.org.apache.camel.language.simple=TRACE -#log4j.logger.org.apache.camel.component=TRACE -#log4j.logger.org.apache.camel.component.seda=TRACE -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.impl.DefaultUnitOfWork=TRACE -#log4j.logger.org.apache.camel.impl.DefaultExecutorServiceManager=TRACE -#log4j.logger.org.apache.camel.impl.DefaultShutdownStrategy=DEBUG -#log4j.logger.org.apache.camel.component.mock=DEBUG -#log4j.logger.org.apache.camel.component.file=TRACE -#log4j.logger.org.apache.camel.processor.DefaultErrorHandler=TRACE -#log4j.logger.org.apache.camel.processor.DeadLetterChannel=TRACE -#log4j.logger.org.apache.camel.processor.Pipeline=TRACE -#log4j.logger.org.apache.camel.processor.MulticastProcessor=TRACE -#log4j.logger.org.apache.camel.processor.RecipientList=TRACE -#log4j.logger.org.apache.camel.processor.RecipientListProcessor=TRACE -#log4j.logger.org.apache.camel.processor.RoutingSlip=TRACE -#log4j.logger.org.apache.camel.processor.TryProcessor=TRACE -#log4j.logger.org.apache.camel.processor.loadbalancer=TRACE -#log4j.logger.org.apache.camel.processor.Delayer=TRACE -#log4j.logger.org.apache.camel.processor.Throttler=TRACE -#log4j.logger.org.apache.camel.processor.aggregate.AggregateProcessor=TRACE -#log4j.logger.org.apache.camel.impl=TRACE -#log4j.logger.org.apache.camel.util.FileUtil=TRACE -#log4j.logger.org.apache.camel.util.AsyncProcessorHelper=TRACE -#log4j.logger.org.apache.camel.util.ServiceHelper=TRACE -#log4j.logger.org.apache.camel.util.jsse=TRACE - -# CONSOLE appender not used by default -log4j.appender.out=org.apache.log4j.ConsoleAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{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.file=target/camel-core-test.log -log4j.appender.file.append=true -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - -# File appender for logging with provided logger -log4j.appender.file2=org.apache.log4j.FileAppender -log4j.appender.file2.layout=org.apache.log4j.PatternLayout -log4j.appender.file2.file=target/custom-logger-test.log -log4j.appender.file2.append=false -log4j.appender.file2.layout.ConversionPattern=%-5p %c{1} %m%n http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/camel-core/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/camel-core/src/test/resources/log4j2.properties b/camel-core/src/test/resources/log4j2.properties new file mode 100644 index 0000000..7418c25 --- /dev/null +++ b/camel-core/src/test/resources/log4j2.properties @@ -0,0 +1,78 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- + +appender.console.type = Console +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n + +appender.file.type = File +appender.file.name = file +appender.file.fileName = target/camel-core-test.log +appender.file.append = true +appender.file.layout.type = PatternLayout +appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n + +appender.file2.type = File +appender.file2.name = file2 +appender.file2.fileName = target/custom-logger-test.log +appender.file2.append = false +appender.file2.layout.type = PatternLayout +appender.file2.layout.pattern = %-5p %c{1} %m%n + +logger.customlogger.name = org.apache.camel.customlogger +logger.customlogger.level = TRACE +logger.customlogger.appenderRef.file2.ref = file2 + +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file + + +#log4j.logger.org.apache.camel.impl.converter=WARN +#log4j.logger.org.apache.camel.management=DEBUG +#log4j.logger.org.apache.camel.impl.DefaultPackageScanClassResolver=WARN +#log4j.logger.org.apache.camel.impl.converter.DefaultTypeConverter=TRACE +#log4j.logger.org.apache.camel.impl.converter=DEBUG +#log4j.logger.org.apache.camel=DEBUG +#log4j.logger.org.apache.camel.builder=TRACE +#log4j.logger.org.apache.camel.language.simple=TRACE +#log4j.logger.org.apache.camel.component=TRACE +#log4j.logger.org.apache.camel.component.seda=TRACE +#log4j.logger.org.apache.camel.component.file=TRACE +#log4j.logger.org.apache.camel.impl.DefaultUnitOfWork=TRACE +#log4j.logger.org.apache.camel.impl.DefaultExecutorServiceManager=TRACE +#log4j.logger.org.apache.camel.impl.DefaultShutdownStrategy=DEBUG +#log4j.logger.org.apache.camel.component.mock=DEBUG +#log4j.logger.org.apache.camel.component.file=TRACE +#log4j.logger.org.apache.camel.processor.DefaultErrorHandler=TRACE +#log4j.logger.org.apache.camel.processor.DeadLetterChannel=TRACE +#log4j.logger.org.apache.camel.processor.Pipeline=TRACE +#log4j.logger.org.apache.camel.processor.MulticastProcessor=TRACE +#log4j.logger.org.apache.camel.processor.RecipientList=TRACE +#log4j.logger.org.apache.camel.processor.RecipientListProcessor=TRACE +#log4j.logger.org.apache.camel.processor.RoutingSlip=TRACE +#log4j.logger.org.apache.camel.processor.TryProcessor=TRACE +#log4j.logger.org.apache.camel.processor.loadbalancer=TRACE +#log4j.logger.org.apache.camel.processor.Delayer=TRACE +#log4j.logger.org.apache.camel.processor.Throttler=TRACE +#log4j.logger.org.apache.camel.processor.aggregate.AggregateProcessor=TRACE +#log4j.logger.org.apache.camel.impl=TRACE +#log4j.logger.org.apache.camel.util.FileUtil=TRACE +#log4j.logger.org.apache.camel.util.AsyncProcessorHelper=TRACE +#log4j.logger.org.apache.camel.util.ServiceHelper=TRACE +#log4j.logger.org.apache.camel.util.jsse=TRACE + http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-ahc-ws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml index 329afab..052282c 100644 --- a/components/camel-ahc-ws/pom.xml +++ b/components/camel-ahc-ws/pom.xml @@ -69,8 +69,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-ahc-ws/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/src/test/resources/log4j.properties b/components/camel-ahc-ws/src/test/resources/log4j.properties deleted file mode 100644 index 89fc1bd..0000000 --- a/components/camel-ahc-ws/src/test/resources/log4j.properties +++ /dev/null @@ -1,43 +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.ahc=TRACE -#log4j.logger.org.apache.camel.util.jsse=DEBUG -#log4j.logger.com.ning=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-ahc-test.log -log4j.appender.file.append=true -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-ahc-ws/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-ahc-ws/src/test/resources/log4j2.properties b/components/camel-ahc-ws/src/test/resources/log4j2.properties new file mode 100644 index 0000000..9c281ac --- /dev/null +++ b/components/camel-ahc-ws/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-ahc-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-ahc/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml index ed742cd..af60a06 100644 --- a/components/camel-ahc/pom.xml +++ b/components/camel-ahc/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> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-ahc/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-ahc/src/test/resources/log4j.properties b/components/camel-ahc/src/test/resources/log4j.properties deleted file mode 100644 index 89fc1bd..0000000 --- a/components/camel-ahc/src/test/resources/log4j.properties +++ /dev/null @@ -1,43 +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.ahc=TRACE -#log4j.logger.org.apache.camel.util.jsse=DEBUG -#log4j.logger.com.ning=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-ahc-test.log -log4j.appender.file.append=true -log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -# MDC -#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-ahc/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-ahc/src/test/resources/log4j2.properties b/components/camel-ahc/src/test/resources/log4j2.properties new file mode 100644 index 0000000..9c281ac --- /dev/null +++ b/components/camel-ahc/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-ahc-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-amqp/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml index 51a37ad..ba7d3aa 100644 --- a/components/camel-amqp/pom.xml +++ b/components/camel-amqp/pom.xml @@ -81,8 +81,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-amqp/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-amqp/src/test/resources/log4j.properties b/components/camel-amqp/src/test/resources/log4j.properties deleted file mode 100644 index a39cc5a..0000000 --- a/components/camel-amqp/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 - -#log4j.logger.org.apache.qpid=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.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-amqp-test.log -log4j.appender.out.append=true - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-amqp/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-amqp/src/test/resources/log4j2.properties b/components/camel-amqp/src/test/resources/log4j2.properties new file mode 100644 index 0000000..5e83f72 --- /dev/null +++ b/components/camel-amqp/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-amqp-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/components/camel-apns/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml index fa6db8e..e5fda78 100644 --- a/components/camel-apns/pom.xml +++ b/components/camel-apns/pom.xml @@ -99,13 +99,18 @@ <!-- Logging --> <!-- Use logging for test --> <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>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-apns/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-apns/src/test/resources/log4j.properties b/components/camel-apns/src/test/resources/log4j.properties deleted file mode 100644 index 66b1202..0000000 --- a/components/camel-apns/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.apns=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-apns-test.log -log4j.appender.file.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-apns/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-apns/src/test/resources/log4j2.properties b/components/camel-apns/src/test/resources/log4j2.properties new file mode 100644 index 0000000..dc4d938 --- /dev/null +++ b/components/camel-apns/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-apns-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 +logger.apns.name = org.apache.camel.component.apns +logger.apns.level = DEBUG +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-atmos/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmos/pom.xml b/components/camel-atmos/pom.xml index 033200f..ea51c78 100644 --- a/components/camel-atmos/pom.xml +++ b/components/camel-atmos/pom.xml @@ -62,8 +62,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-atmos/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-atmos/src/test/resources/log4j.properties b/components/camel-atmos/src/test/resources/log4j.properties deleted file mode 100644 index 1f2a1f3..0000000 --- a/components/camel-atmos/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 -# -log4j.rootLogger=INFO, out - -log4j.logger.org.springframework=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-atmos-test.log -log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-atmos/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-atmos/src/test/resources/log4j2.properties b/components/camel-atmos/src/test/resources/log4j2.properties new file mode 100644 index 0000000..c7c5981 --- /dev/null +++ b/components/camel-atmos/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-atmos-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.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/components/camel-atmosphere-websocket/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index 9bbea9b..321a0bc 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -112,10 +112,20 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </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> <!-- Jetty for testing --> http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-atmosphere-websocket/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/test/resources/log4j.properties b/components/camel-atmosphere-websocket/src/test/resources/log4j.properties deleted file mode 100644 index bb1dc33..0000000 --- a/components/camel-atmosphere-websocket/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 for testing -# -log4j.rootLogger=INFO, file - -# uncomment the following line to turn on Camel debugging -log4j.logger.org.apache.camel.component.wsservlet=INFO -log4j.logger.org.atmosphere.cpr=INFO -log4j.logger.com.ning.http.client=INFO -log4j.logger.org.eclipse.jetty.websocket=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-atmosphere-websocket-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-atmosphere-websocket/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-atmosphere-websocket/src/test/resources/log4j2.properties b/components/camel-atmosphere-websocket/src/test/resources/log4j2.properties new file mode 100644 index 0000000..0f3f6bb --- /dev/null +++ b/components/camel-atmosphere-websocket/src/test/resources/log4j2.properties @@ -0,0 +1,36 @@ +## --------------------------------------------------------------------------- +## 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-atmosphere-websocket-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.client.name = com.ning.http.client +logger.client.level = INFO +logger.wsservlet.name = org.apache.camel.component.wsservlet +logger.wsservlet.level = INFO +logger.cpr.name = org.atmosphere.cpr +logger.cpr.level = INFO +logger.websocket.name = org.eclipse.jetty.websocket +logger.websocket.level = INFO +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-atom/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml index edcd743..07a9dc0 100644 --- a/components/camel-atom/pom.xml +++ b/components/camel-atom/pom.xml @@ -181,8 +181,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-atom/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-atom/src/test/resources/log4j.properties b/components/camel-atom/src/test/resources/log4j.properties deleted file mode 100644 index af1fb61..0000000 --- a/components/camel-atom/src/test/resources/log4j.properties +++ /dev/null @@ -1,40 +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.activemq=DEBUG - -#log4j.logger.org.apache.camel=DEBUG -log4j.logger.org.apache.camel.impl.converter=INFO -log4j.logger.org.apache.camel.component.atom=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-atom-test.log -log4j.appender.file.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-atom/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-atom/src/test/resources/log4j2.properties b/components/camel-atom/src/test/resources/log4j2.properties new file mode 100644 index 0000000..249e464 --- /dev/null +++ b/components/camel-atom/src/test/resources/log4j2.properties @@ -0,0 +1,32 @@ +## --------------------------------------------------------------------------- +## 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-atom-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 +logger.atom.name = org.apache.camel.component.atom +logger.atom.level = DEBUG +logger.converter.name = org.apache.camel.impl.converter +logger.converter.level = INFO +rootLogger.level = INFO +rootLogger.appenderRef.file.ref = file http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-avro/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml index 51a0e94..6a996d7 100644 --- a/components/camel-avro/pom.xml +++ b/components/camel-avro/pom.xml @@ -140,8 +140,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-avro/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-avro/src/test/resources/log4j.properties b/components/camel-avro/src/test/resources/log4j.properties deleted file mode 100644 index 6bb82ad..0000000 --- a/components/camel-avro/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, out - -log4j.logger.org.apache.camel.component.avro=DEBUG -log4j.logger.org.apache.camel.dataformat.avro=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.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-avro-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-avro/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-avro/src/test/resources/log4j2.properties b/components/camel-avro/src/test/resources/log4j2.properties new file mode 100644 index 0000000..cfe0641 --- /dev/null +++ b/components/camel-avro/src/test/resources/log4j2.properties @@ -0,0 +1,32 @@ +## --------------------------------------------------------------------------- +## 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-avro-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.camel.name = org.apache.camel +logger.camel.level = DEBUG +logger.avro.name = org.apache.camel.dataformat.avro +logger.avro.level = DEBUG +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-aws/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml index e54209e..6bf968f 100644 --- a/components/camel-aws/pom.xml +++ b/components/camel-aws/pom.xml @@ -135,8 +135,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-aws/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/resources/log4j.properties b/components/camel-aws/src/test/resources/log4j.properties deleted file mode 100644 index 53927ff..0000000 --- a/components/camel-aws/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.aws=TRACE -#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-aws-test.log -log4j.appender.file.append=false http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-aws/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/resources/log4j2.properties b/components/camel-aws/src/test/resources/log4j2.properties new file mode 100644 index 0000000..07111be --- /dev/null +++ b/components/camel-aws/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-aws-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-bam/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml index eab1fe7..bf16a90 100644 --- a/components/camel-bam/pom.xml +++ b/components/camel-bam/pom.xml @@ -72,8 +72,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-bam/src/test/profiles/eclipselink/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-bam/src/test/profiles/eclipselink/log4j.properties b/components/camel-bam/src/test/profiles/eclipselink/log4j.properties deleted file mode 100644 index 06bfcf5..0000000 --- a/components/camel-bam/src/test/profiles/eclipselink/log4j.properties +++ /dev/null @@ -1,40 +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=DEBUG, out - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG -log4j.logger.org.apache.camel.bam=DEBUG - -log4j.logger.org.springframework=DEBUG -log4j.logger.org.hibernate=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-bam-test.log -log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bam/src/test/profiles/eclipselink/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-bam/src/test/profiles/eclipselink/log4j2.properties b/components/camel-bam/src/test/profiles/eclipselink/log4j2.properties new file mode 100644 index 0000000..93fb825 --- /dev/null +++ b/components/camel-bam/src/test/profiles/eclipselink/log4j2.properties @@ -0,0 +1,34 @@ +## --------------------------------------------------------------------------- +## 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-bam-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.bam.name = org.apache.camel.bam +logger.bam.level = DEBUG +logger.hibernate.name = org.hibernate +logger.hibernate.level = WARN +logger.springframework.name = org.springframework +logger.springframework.level = DEBUG +rootLogger.level = DEBUG +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bam/src/test/profiles/hibernate/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-bam/src/test/profiles/hibernate/log4j.properties b/components/camel-bam/src/test/profiles/hibernate/log4j.properties deleted file mode 100644 index 06bfcf5..0000000 --- a/components/camel-bam/src/test/profiles/hibernate/log4j.properties +++ /dev/null @@ -1,40 +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=DEBUG, out - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG -log4j.logger.org.apache.camel.bam=DEBUG - -log4j.logger.org.springframework=DEBUG -log4j.logger.org.hibernate=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-bam-test.log -log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bam/src/test/profiles/hibernate/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-bam/src/test/profiles/hibernate/log4j2.properties b/components/camel-bam/src/test/profiles/hibernate/log4j2.properties new file mode 100644 index 0000000..93fb825 --- /dev/null +++ b/components/camel-bam/src/test/profiles/hibernate/log4j2.properties @@ -0,0 +1,34 @@ +## --------------------------------------------------------------------------- +## 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-bam-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.bam.name = org.apache.camel.bam +logger.bam.level = DEBUG +logger.hibernate.name = org.hibernate +logger.hibernate.level = WARN +logger.springframework.name = org.springframework +logger.springframework.level = DEBUG +rootLogger.level = DEBUG +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bam/src/test/profiles/openjpa/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-bam/src/test/profiles/openjpa/log4j.properties b/components/camel-bam/src/test/profiles/openjpa/log4j.properties deleted file mode 100644 index 874b15a..0000000 --- a/components/camel-bam/src/test/profiles/openjpa/log4j.properties +++ /dev/null @@ -1,52 +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=DEBUG, out - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG -log4j.logger.org.apache.camel.bam=DEBUG - -log4j.logger.org.springframework=DEBUG -log4j.logger.org.hibernate=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-bam-test.log -log4j.appender.out.append=true - -# OpenJPA - more info on http://openjpa.apache.org/builds/1.0.2/apache-openjpa-1.0.2/docs/manual/manual.html#ref_guide_logging -log4j.category.openjpa.Tool=TRACE -log4j.category.openjpa.Runtime=TRACE -log4j.category.openjpa.Remote=WARN -log4j.category.openjpa.DataCache=WARN -log4j.category.openjpa.MetaData=WARN -log4j.category.openjpa.Enhance=WARN -log4j.category.openjpa.Query=WARN -log4j.category.openjpa.jdbc.SQL=TRACE -log4j.category.openjpa.jdbc.JDBC=WARN -log4j.category.openjpa.jdbc.Schema=WARN http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bam/src/test/profiles/openjpa/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-bam/src/test/profiles/openjpa/log4j2.properties b/components/camel-bam/src/test/profiles/openjpa/log4j2.properties new file mode 100644 index 0000000..93fb825 --- /dev/null +++ b/components/camel-bam/src/test/profiles/openjpa/log4j2.properties @@ -0,0 +1,34 @@ +## --------------------------------------------------------------------------- +## 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-bam-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.bam.name = org.apache.camel.bam +logger.bam.level = DEBUG +logger.hibernate.name = org.hibernate +logger.hibernate.level = WARN +logger.springframework.name = org.springframework +logger.springframework.level = DEBUG +rootLogger.level = DEBUG +rootLogger.appenderRef.out.ref = out http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bam/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-bam/src/test/resources/log4j.properties b/components/camel-bam/src/test/resources/log4j.properties deleted file mode 100644 index 7c199ea..0000000 --- a/components/camel-bam/src/test/resources/log4j.properties +++ /dev/null @@ -1,40 +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, out - -# uncomment the next line to debug Camel -#log4j.logger.org.apache.camel=DEBUG -log4j.logger.org.apache.camel.bam=DEBUG - -log4j.logger.org.springframework=WARN -log4j.logger.org.hibernate=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-bam-test.log -log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-bam/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-bam/src/test/resources/log4j2.properties b/components/camel-bam/src/test/resources/log4j2.properties new file mode 100644 index 0000000..038fc9a --- /dev/null +++ b/components/camel-bam/src/test/resources/log4j2.properties @@ -0,0 +1,34 @@ +## --------------------------------------------------------------------------- +## 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-bam-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.bam.name = org.apache.camel.bam +logger.bam.level = DEBUG +logger.hibernate.name = org.hibernate +logger.hibernate.level = WARN +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/components/camel-barcode/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-barcode/pom.xml b/components/camel-barcode/pom.xml index c6269c2..9d90816 100644 --- a/components/camel-barcode/pom.xml +++ b/components/camel-barcode/pom.xml @@ -58,8 +58,18 @@ limitations under the License. <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-barcode/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-barcode/src/test/resources/log4j.properties b/components/camel-barcode/src/test/resources/log4j.properties deleted file mode 100644 index 4d6d975..0000000 --- a/components/camel-barcode/src/test/resources/log4j.properties +++ /dev/null @@ -1,21 +0,0 @@ -# -# The logging properties used -# -log4j.rootLogger=INFO, file - -# 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 - -# 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-barcode-test.log - - http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-barcode/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-barcode/src/test/resources/log4j2.properties b/components/camel-barcode/src/test/resources/log4j2.properties new file mode 100644 index 0000000..a3358a0 --- /dev/null +++ b/components/camel-barcode/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-barcode-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-base64/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml index d366955..9092f3a 100644 --- a/components/camel-base64/pom.xml +++ b/components/camel-base64/pom.xml @@ -62,8 +62,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-base64/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-base64/src/test/resources/log4j.properties b/components/camel-base64/src/test/resources/log4j.properties deleted file mode 100755 index 7fa927b..0000000 --- a/components/camel-base64/src/test/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 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-base64-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/1cea9cc2/components/camel-base64/src/test/resources/log4j2.properties ---------------------------------------------------------------------- diff --git a/components/camel-base64/src/test/resources/log4j2.properties b/components/camel-base64/src/test/resources/log4j2.properties new file mode 100644 index 0000000..805bdc7 --- /dev/null +++ b/components/camel-base64/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-base64-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
