Author: bvahdat
Date: Wed Jan 2 20:06:34 2013
New Revision: 1427989
URL: http://svn.apache.org/viewvc?rev=1427989&view=rev
Log:
Fixed the tests by camel-spring-batch to log properly (the slf4j static
initialization used to fail). Also removed 2 obsolete dependencies from it's
pom.
Added:
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
(with props)
Modified:
camel/trunk/components/camel-spring-batch/pom.xml
Modified: camel/trunk/components/camel-spring-batch/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-batch/pom.xml?rev=1427989&r1=1427988&r2=1427989&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-batch/pom.xml (original)
+++ camel/trunk/components/camel-spring-batch/pom.xml Wed Jan 2 20:06:34 2013
@@ -47,14 +47,14 @@
<!-- test dependencies -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang-version}</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -69,11 +69,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
<scope>test</scope>
</dependency>
Added:
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties?rev=1427989&view=auto
==============================================================================
---
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
(added)
+++
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
Wed Jan 2 20:06:34 2013
@@ -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 for testing.
+#
+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 [%-15.15t] %-5p %-30.30c{1} -
%m%n
+log4j.appender.file.file=target/camel-spring-ws-test.log
+log4j.appender.file.append=true
Propchange:
camel/trunk/components/camel-spring-batch/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native