Author: davsclaus
Date: Fri Dec 2 10:43:03 2011
New Revision: 1209391
URL: http://svn.apache.org/viewvc?rev=1209391&view=rev
Log:
CAMEL-4539: Polished and fixed so using log4j logging.
Added:
camel/trunk/components/camel-solr/src/test/resources/log4j.properties
Modified:
camel/trunk/components/camel-solr/ (props changed)
camel/trunk/components/camel-solr/pom.xml
Propchange: camel/trunk/components/camel-solr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Dec 2 10:43:03 2011
@@ -0,0 +1,9 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes
+*.i??
+classes
Modified: camel/trunk/components/camel-solr/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/pom.xml?rev=1209391&r1=1209390&r2=1209391&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/pom.xml (original)
+++ camel/trunk/components/camel-solr/pom.xml Fri Dec 2 10:43:03 2011
@@ -65,6 +65,13 @@
<artifactId>solr-core</artifactId>
<version>${solr-version}</version>
<scope>test</scope>
+ <exclusions>
+ <!-- exclude jdk14 as we want to use log4j -->
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -72,6 +79,13 @@
<artifactId>solr-cell</artifactId>
<version>${solr-version}</version>
<scope>test</scope>
+ <exclusions>
+ <!-- exclude netcdf as it has a slf4j binding -->
+ <exclusion>
+ <groupId>edu.ucar</groupId>
+ <artifactId>netcdf</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Added: camel/trunk/components/camel-solr/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/resources/log4j.properties?rev=1209391&view=auto
==============================================================================
--- camel/trunk/components/camel-solr/src/test/resources/log4j.properties
(added)
+++ camel/trunk/components/camel-solr/src/test/resources/log4j.properties Fri
Dec 2 10:43:03 2011
@@ -0,0 +1,40 @@
+## ---------------------------------------------------------------------------
+## 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.springframework=WARN
+
+# uncomment this to turn on debug of camel
+#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.component.solr=TRACE
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1}
- %m%n
+
+# File appender
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.file.file=target/camel-solr-test.log
+log4j.appender.file.append=true
+
+log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer
