Author: davsclaus
Date: Wed Oct 15 13:47:10 2008
New Revision: 705038
URL: http://svn.apache.org/viewvc?rev=705038&view=rev
Log:
CAMEL-843: Upgraded to Quartz 1.6.1
Modified:
activemq/camel/trunk/components/camel-quartz/pom.xml
activemq/camel/trunk/components/camel-quartz/src/test/resources/log4j.properties
Modified: activemq/camel/trunk/components/camel-quartz/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-quartz/pom.xml?rev=705038&r1=705037&r2=705038&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-quartz/pom.xml (original)
+++ activemq/camel/trunk/components/camel-quartz/pom.xml Wed Oct 15 13:47:10
2008
@@ -37,16 +37,30 @@
<camel.osgi.export.pkg>org.apache.camel.component.quartz.*</camel.osgi.export.pkg>
</properties>
- <dependencies>
+ <repositories>
+ <repository>
+ <id>servicemix</id>
+ <name>Apache ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>quartz</groupId>
+ <groupId>opensymphony</groupId>
<artifactId>quartz</artifactId>
- <version>1.5.2</version>
+ <version>1.6.1</version>
+ </dependency>
+ <!-- commons-collections is needed at runtime by quartz -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
</dependency>
<!-- testing -->
Modified:
activemq/camel/trunk/components/camel-quartz/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-quartz/src/test/resources/log4j.properties?rev=705038&r1=705037&r2=705038&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-quartz/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/components/camel-quartz/src/test/resources/log4j.properties
Wed Oct 15 13:47:10 2008
@@ -18,13 +18,19 @@
#
# The logging properties used for eclipse testing, We want to see debug output
on the console.
#
-log4j.rootLogger=INFO, out
+log4j.rootLogger=INFO, file
-log4j.logger.org.quartz=WARN
-#log4j.logger.org.apache.camel=DEBUG
+# uncomment the following to enable 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
+#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-quartz-test.log
\ No newline at end of file