Author: davsclaus
Date: Mon Jun 16 01:02:05 2008
New Revision: 668067
URL: http://svn.apache.org/viewvc?rev=668067&view=rev
Log:
CAMEL-605: Changed to direct queues to fix the spring data set problem. The bug
is the with the seda queues and high concurrency. A new unit test in camel-core
is created demonstrating the bug.
CAMEL-611. Removed unused file.
Removed:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/builder/spring_route_builder_test.xml
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/log4j.properties
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/log4j.properties?rev=668067&r1=668066&r2=668067&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/log4j.properties
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/log4j.properties
Mon Jun 16 01:02:05 2008
@@ -18,11 +18,7 @@
#
# The logging properties used for eclipse testing, We want to see debug output
on the console.
#
-log4j.rootLogger=INFO, out
-
-log4j.logger.org.apache.camel=WARN
-#log4j.logger.org.apache.camel.component.test=DEBUG
-
+log4j.rootLogger=INFO, file
log4j.logger.org.springframework=WARN
#log4j.logger.org.apache.camel=DEBUG
@@ -32,3 +28,9 @@
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-spring-test.log
Modified:
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml?rev=668067&r1=668066&r2=668067&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/dataset/SpringDataSetTest-context.xml
Mon Jun 16 01:02:05 2008
@@ -27,18 +27,19 @@
<route>
<from uri="dataset:foo"/>
- <to uri="seda:test.queue"/>
+ <to uri="direct:test.queue"/>
</route>
<route>
- <from uri="seda:test.queue"/>
+ <from uri="direct:test.queue"/>
<to uri="dataset:foo"/>
</route>
</camelContext>
<bean id="foo" class="org.apache.camel.component.dataset.SimpleDataSet">
- <property name="size" value="10"/>
+ <property name="size" value="100"/>
</bean>
+
</beans>
<!-- END SNIPPET: example -->