Author: hadrian
Date: Thu Feb 9 22:45:32 2012
New Revision: 1242581
URL: http://svn.apache.org/viewvc?rev=1242581&view=rev
Log:
Recorded merge of revisions
1235633,1235635-1235642,1235644-1235668,1235670-1235686,1235688-1235705,1235708-1235714,1235716,1235719-1235726,1235728-1235970,1235972-1235978,1235980-1236082,1236084-1236248,1236250-1236324,1236326-1236476,1236478-1236486,1236488-1236493,1236495-1236566,1236568-1236614,1236616-1236638,1236640-1236666,1236668-1236679,1236681-1237048,1237050-1237051,1237053-1237147,1237149-1237229,1237231-1237239,1237242-1237366,1237368-1237371,1237373-1237380,1237382-1237569,1237571-1237588,1237590-1237602,1237604-1237665,1237667-1237675,1237677-1237680,1237682-1237806,1237808-1238060
via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1235633 | davsclaus | 2012-01-25 00:42:56 -0500 (Wed, 25 Jan 2012) | 1 line
CAMEL-4937: Polished
........
r1236403 | bvahdat | 2012-01-26 16:51:58 -0500 (Thu, 26 Jan 2012) | 1 line
CAMEL-4942: Jaxb-FallbackTypeConverter should hark to the contract of
TypeConverter and not throw any unchecked exception if the conversion fails
........
r1236576 | bvahdat | 2012-01-27 03:21:52 -0500 (Fri, 27 Jan 2012) | 1 line
CAMEL-4942: Added the provided test given by the ticket which verifies the Fix
........
r1236654 | bvahdat | 2012-01-27 07:33:01 -0500 (Fri, 27 Jan 2012) | 1 line
CAMEL-4942: Renamed the test case to better fit into its intention
........
r1236663 | bvahdat | 2012-01-27 07:52:52 -0500 (Fri, 27 Jan 2012) | 1 line
CAMEL-4942: Moved the test 'FallbackTypeConverterShouldNotThrowExceptionTest'
better to the package 'org.apache.camel.jaxb'
........
r1237327 | bvahdat | 2012-01-29 11:28:15 -0500 (Sun, 29 Jan 2012) | 1 line
CAMEL-4938: Polished by overriding getEndpoint() & getInstance() methods
which make use of covariant return types (work in progress).
........
r1238060 | bvahdat | 2012-01-30 17:44:31 -0500 (Mon, 30 Jan 2012) | 1 line
CAMEL-4938: Undo the unintended changes with Thread.sleep() and enableJMX()
calls.
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
