Merge branch 'master' of github.com:apache/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e997e22 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e997e22 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e997e22 Branch: refs/heads/master Commit: 3e997e22f298a181dda24e4ee73c56ee0fd052a1 Parents: fb5c57f 8c2640c Author: Antoine Sabot-Durand <anto...@sabot-durand.net> Authored: Thu Nov 7 11:39:55 2013 +0100 Committer: Antoine Sabot-Durand <anto...@sabot-durand.net> Committed: Thu Nov 7 11:39:55 2013 +0100 ---------------------------------------------------------------------- .../camel/converter/jaxp/XmlConverter.java | 1 - .../jms/JmsMediumQueuePerformanceTest.java | 48 +------ .../camel/itest/jms/JmsPerformanceTest.java | 133 +++++++------------ .../src/test/resources/activemq7.xml | 33 ----- .../src/test/resources/activemq8.xml | 33 ----- 5 files changed, 50 insertions(+), 198 deletions(-) ----------------------------------------------------------------------
