Author: dkulp
Date: Wed Oct 12 03:07:59 2011
New Revision: 1182182
URL: http://svn.apache.org/viewvc?rev=1182182&view=rev
Log:
Recorded merge of revisions
1179153,1179233-1179234,1179291,1179342,1179607,1179667,1180703,1180785 via
svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1179153 | cschneider | 2011-10-05 06:46:45 -0400 (Wed, 05 Oct 2011) | 1 line
CAMEL-4500 Adding a TraceEventHandler that supports JMX Notifications. Moving
the standard trace logic to a new TraceEventHandler
........
r1179233 | cschneider | 2011-10-05 10:07:17 -0400 (Wed, 05 Oct 2011) | 1 line
CAMEL-4500 Removing DispatchingTraceEventHandler and instead adding the
functionality to TraceInterceptor. So we can support more than one tracer
........
r1179234 | cschneider | 2011-10-05 10:12:03 -0400 (Wed, 05 Oct 2011) | 1 line
CAMEL-4500 Bugfix for traceState
........
r1179291 | cschneider | 2011-10-05 12:12:55 -0400 (Wed, 05 Oct 2011) | 1 line
CAMEL-4500 Bugfix for handling more than one handler and for changing the
handler of an interceptor
........
r1179342 | dkulp | 2011-10-05 13:33:34 -0400 (Wed, 05 Oct 2011) | 3 lines
[CAMEL-4500] Make the traceHandlers list threadsafe and allow the
TraceInterceptor to use the live list (instead of a copy of it) to allow
dynamic changing of the tracers
........
r1179607 | cschneider | 2011-10-06 09:04:52 -0400 (Thu, 06 Oct 2011) | 1 line
CAMEL-4500 Bugfix for the case where the body is a stream
........
r1179667 | cschneider | 2011-10-06 11:29:26 -0400 (Thu, 06 Oct 2011) | 1 line
CAMEL-4500 Adding configuration options for the tracer
........
r1180703 | cmueller | 2011-10-09 16:13:59 -0400 (Sun, 09 Oct 2011) | 1 line
CAMEL-4524: Upgrade jsmpp-bundle to version 2.1.0_3
........
r1180785 | cmueller | 2011-10-10 01:51:01 -0400 (Mon, 10 Oct 2011) | 1 line
CAMEL-4523: Upgrade to EasyMock 3.0
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.