Author: davsclaus
Date: Tue Feb 1 14:37:35 2011
New Revision: 1066054
URL: http://svn.apache.org/viewvc?rev=1066054&view=rev
Log:
CAMEL-3605: Migrating to slf4j. Fixing components so they can run tests.
Added:
camel/trunk/components/camel-gae/src/test/resources/log4j.properties
Modified:
camel/trunk/components/camel-aws/pom.xml
camel/trunk/components/camel-exec/pom.xml
camel/trunk/components/camel-gae/pom.xml
camel/trunk/components/camel-hawtdb/pom.xml
camel/trunk/components/camel-http4/pom.xml
camel/trunk/components/camel-jdbc/pom.xml
camel/trunk/components/camel-jibx/pom.xml
camel/trunk/components/camel-servlet/pom.xml
camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
Modified: camel/trunk/components/camel-aws/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/pom.xml?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-aws/pom.xml (original)
+++ camel/trunk/components/camel-aws/pom.xml Tue Feb 1 14:37:35 2011
@@ -62,6 +62,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-exec/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-exec/pom.xml?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-exec/pom.xml (original)
+++ camel/trunk/components/camel-exec/pom.xml Tue Feb 1 14:37:35 2011
@@ -70,6 +70,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-gae/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/pom.xml?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-gae/pom.xml (original)
+++ camel/trunk/components/camel-gae/pom.xml Tue Feb 1 14:37:35 2011
@@ -102,6 +102,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Added: camel/trunk/components/camel-gae/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-gae/src/test/resources/log4j.properties?rev=1066054&view=auto
==============================================================================
--- camel/trunk/components/camel-gae/src/test/resources/log4j.properties (added)
+++ camel/trunk/components/camel-gae/src/test/resources/log4j.properties Tue
Feb 1 14:37:35 2011
@@ -0,0 +1,37 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used
+#
+log4j.rootLogger=INFO, file
+
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.file.file=target/camel-gae-test.log
+log4j.appender.file.append=true
+
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
\ No newline at end of file
Modified: camel/trunk/components/camel-hawtdb/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/pom.xml?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/pom.xml (original)
+++ camel/trunk/components/camel-hawtdb/pom.xml Tue Feb 1 14:37:35 2011
@@ -59,6 +59,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-http4/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/pom.xml?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/pom.xml (original)
+++ camel/trunk/components/camel-http4/pom.xml Tue Feb 1 14:37:35 2011
@@ -76,6 +76,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/pom.xml?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/pom.xml (original)
+++ camel/trunk/components/camel-jdbc/pom.xml Tue Feb 1 14:37:35 2011
@@ -68,6 +68,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-jibx/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/pom.xml?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-jibx/pom.xml (original)
+++ camel/trunk/components/camel-jibx/pom.xml Tue Feb 1 14:37:35 2011
@@ -58,6 +58,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/pom.xml?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/pom.xml (original)
+++ camel/trunk/components/camel-servlet/pom.xml Tue Feb 1 14:37:35 2011
@@ -45,6 +45,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified:
camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-servlet/src/test/resources/log4j.properties?rev=1066054&r1=1066053&r2=1066054&view=diff
==============================================================================
--- camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
(original)
+++ camel/trunk/components/camel-servlet/src/test/resources/log4j.properties
Tue Feb 1 14:37:35 2011
@@ -1,15 +1,26 @@
+## ---------------------------------------------------------------------------
+## 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.
+# The logging properties used
#
log4j.rootLogger=INFO, file
#log4j.logger.org.apache.camel=DEBUG
-log4j.logger.org.apache.camel.impl.converter=WARN
-log4j.logger.org.apache.camel.management=WARN
-log4j.logger.org.apache.camel.impl.DefaultPackageScanClassResolver=WARN
-
-log4j.logger.org.springframework=WARN
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
