Author: hadrian
Date: Sun Apr 1 02:48:40 2012
New Revision: 1308004
URL: http://svn.apache.org/viewvc?rev=1308004&view=rev
Log:
Blocked revisions
1294555,1294636,1294693,1294707,1294712,1294893,1295096,1295387,1295573,1295579,1295633,1295642,1295644,1295679,1295748,1295925,1295928,1295962,1295991,1296196,1296215,1296314,1296457,1296766,1296769,1296778-1296779,1296781,1296785,1296787,1296789,1296791,1296793,1296795,1296803-1296804,1296872,1296954,1296957,1296974
via svnmerge
........
r1294555 | davsclaus | 2012-02-28 05:31:27 -0500 (Tue, 28 Feb 2012) | 1 line
CAMEL-4923: Applied the code cleanup patch from Bilgin.
........
r1294636 | davsclaus | 2012-02-28 08:28:13 -0500 (Tue, 28 Feb 2012) | 1 line
Polished javadoc
........
r1294693 | akarpe | 2012-02-28 10:33:10 -0500 (Tue, 28 Feb 2012) | 1 line
Fixed CAMEL-5039 Make WeightedRandomLoadBalancer really random. Many Thanks
to Xavier Fournet for the bug identification, submission of this patch and
well documented test cases.
........
r1294707 | hadrian | 2012-02-28 10:59:51 -0500 (Tue, 28 Feb 2012) | 1 line
Checkstyle fix
........
r1294712 | akarpe | 2012-02-28 11:07:22 -0500 (Tue, 28 Feb 2012) | 1 line
Fixed CAMEL-4866 Upgrade Commons Net to version 3.0.1.
........
r1294893 | cmueller | 2012-02-28 18:31:58 -0500 (Tue, 28 Feb 2012) | 1 line
CAMEL-5052: DefaultUnitOfWork should copy headers from the original message
if it's a JmsMessage
........
r1295096 | davsclaus | 2012-02-29 08:31:26 -0500 (Wed, 29 Feb 2012) | 1 line
CAMEL-4866: Fixed upgrade of camel-ftp for osgi.
........
r1295387 | ningjiang | 2012-02-29 21:45:35 -0500 (Wed, 29 Feb 2012) | 1 line
Add a message header test on the CxfProducer
........
r1295573 | bvahdat | 2012-03-01 09:12:22 -0500 (Thu, 01 Mar 2012) | 1 line
Fixed the false positive behaving JmsHeaderFilteringTest.
........
r1295579 | davsclaus | 2012-03-01 09:20:19 -0500 (Thu, 01 Mar 2012) | 1 line
CAMEL-5056: @deprecated not used fluent builders on bean def. Allow to set
bean type by class.
........
r1295633 | dvaleri | 2012-03-01 10:50:19 -0500 (Thu, 01 Mar 2012) | 1 line
[CAMEL-5037] Added support for JSSE Confoguration Utility to Mina 2 component.
........
r1295642 | dvaleri | 2012-03-01 10:59:55 -0500 (Thu, 01 Mar 2012) | 1 line
[CAMEL-4987] Integrate Spring Test with Camel test support for TestNG.
........
r1295644 | bvahdat | 2012-03-01 11:01:56 -0500 (Thu, 01 Mar 2012) | 1 line
Fixed the failed test on the CI-Server.
........
r1295679 | dvaleri | 2012-03-01 12:10:58 -0500 (Thu, 01 Mar 2012) | 1 line
[CAMEL-4840] Deprecated JUnit 3.x based test support classes.
........
r1295748 | dvaleri | 2012-03-01 14:07:13 -0500 (Thu, 01 Mar 2012) | 1 line
[CAMEL-4987] Updated test for use as a documentation example.
........
r1295925 | hadrian | 2012-03-01 16:55:39 -0500 (Thu, 01 Mar 2012) | 1 line
Checkstyle - order of imports
........
r1295928 | hadrian | 2012-03-01 16:57:19 -0500 (Thu, 01 Mar 2012) | 1 line
Fix feature validation. Remove dependency on snapshot
........
r1295962 | dvaleri | 2012-03-01 17:52:57 -0500 (Thu, 01 Mar 2012) | 1 line
[CAMEL-4987] Minor documentation tweaks and fix of a false positive unit test
in Spring Test support.
........
r1295991 | dvaleri | 2012-03-01 18:35:34 -0500 (Thu, 01 Mar 2012) | 1 line
[CAMEL-4081] Updated AHC to 1.7.1 and removed workaround.
........
r1296196 | davsclaus | 2012-03-02 08:26:05 -0500 (Fri, 02 Mar 2012) | 1 line
CAMEL-5041: Fixed so route scoped error handlers is removed from JMX when
removing a route, to not leak memory.
........
r1296215 | jstrachan | 2012-03-02 09:10:03 -0500 (Fri, 02 Mar 2012) | 1 line
added a first spike of a stub component for CAMEL-5057
........
r1296314 | davsclaus | 2012-03-02 12:17:26 -0500 (Fri, 02 Mar 2012) | 1 line
CAMEL-5057: Fixed CS
........
r1296457 | bvahdat | 2012-03-02 16:00:22 -0500 (Fri, 02 Mar 2012) | 1 line
Implement Message.copyFrom() solely at one class level.
........
r1296766 | davsclaus | 2012-03-04 02:59:13 -0500 (Sun, 04 Mar 2012) | 1 line
Polished
........
r1296769 | davsclaus | 2012-03-04 03:48:25 -0500 (Sun, 04 Mar 2012) | 1 line
CAMEL-5059: Added mockEndpointsAndSkip to advice with and test kit.
........
r1296778 | davsclaus | 2012-03-04 05:43:45 -0500 (Sun, 04 Mar 2012) | 1 line
CAMEL-4602: GenericFileFilter now supports directories. Thanks to Michael for
partly patch.
........
r1296779 | davsclaus | 2012-03-04 05:51:25 -0500 (Sun, 04 Mar 2012) | 1 line
CAMEL-5047: MDC logging keys has been prefixed with camel. Thanks to Lukasz
for the patch.
........
r1296781 | cmueller | 2012-03-04 06:31:13 -0500 (Sun, 04 Mar 2012) | 1 line
Improved the unit tests to check that countDownLatch.await(timeout, timeUnit)
returns true which means it was NOT triggered by the timeout
........
r1296785 | davsclaus | 2012-03-04 07:27:53 -0500 (Sun, 04 Mar 2012) | 1 line
CAMEL-5047: MDC logging keys has been prefixed with camel. Adjusted tests.
........
r1296787 | bvahdat | 2012-03-04 07:39:03 -0500 (Sun, 04 Mar 2012) | 1 line
CAMEL-4797: DataFormat.unmarshal() should allow to return Message or Exchange
to make it more flexible.
........
r1296789 | davsclaus | 2012-03-04 07:48:32 -0500 (Sun, 04 Mar 2012) | 1 line
CAMEL-5047: MDC logging keys has been prefixed with camel. Adjusted tests.
........
r1296791 | cmueller | 2012-03-04 07:51:11 -0500 (Sun, 04 Mar 2012) | 3 lines
Revert "Improved the unit tests to check that countDownLatch.await(timeout,
timeUnit) returns true which means it was NOT triggered by the timeout"
This reverts commit fa9f6422e95638148d32cdee9c5ab2b6f2d18342.
........
r1296793 | cmueller | 2012-03-04 07:53:30 -0500 (Sun, 04 Mar 2012) | 1 line
Improved the unit tests to check that countDownLatch.await(timeout, timeUnit)
returns true which means it was NOT triggered by the timeout
........
r1296795 | davsclaus | 2012-03-04 07:58:56 -0500 (Sun, 04 Mar 2012) | 1 line
CAMEL-4967: Upgraded to jasypt 1.9.
........
r1296803 | bvahdat | 2012-03-04 08:18:50 -0500 (Sun, 04 Mar 2012) | 1 line
CAMEL-4797: Cleanup of UnmarshalProcessorTest.
........
r1296804 | bvahdat | 2012-03-04 08:23:57 -0500 (Sun, 04 Mar 2012) | 1 line
Fixed CS.
........
r1296872 | bvahdat | 2012-03-04 15:19:16 -0500 (Sun, 04 Mar 2012) | 1 line
Fixed the failed MyBatisBatchConsumerTest on the CI-Server.
........
r1296954 | bvahdat | 2012-03-05 03:04:35 -0500 (Mon, 05 Mar 2012) | 1 line
CAMEL-4797: Relaxed the restriction about DataFormat not being allowed to
return null, as an example SoapJaxbDataFormat does that.
........
r1296957 | bvahdat | 2012-03-05 03:28:28 -0500 (Mon, 05 Mar 2012) | 1 line
CAMEL-4797: Added one more assert to UnmarshalProcessorTest.
........
r1296974 | davsclaus | 2012-03-05 04:23:11 -0500 (Mon, 05 Mar 2012) | 1 line
CAMEL-4680: Check for clash with multiple consumers when starting a new route
manually using startRoute
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.