Author: hadrian Date: Mon Apr 23 01:28:31 2012 New Revision: 1329020 URL: http://svn.apache.org/viewvc?rev=1329020&view=rev Log: Blocked revisions 1235644,1236671,1237150,1237232,1237671,1237810,1238063,1238239,1238242,1238389,1238481,1238483,1238508,1238990,1239007,1239046,1239110,1239113,1239471,1239510-1239511,1240066,1240146,1240187,1240681,1240771,1240793,1241258-1241260,1241332,1241496,1241501,1241504,1241779,1241790,1242581-1242582,1242621,1242623-1242624,1242634,1242644,1242651,1242653-1242654 via svnmerge
................ r1235644 | davsclaus | 2012-01-25 01:51:38 -0500 (Wed, 25 Jan 2012) | 1 line Fixed test ................ r1236671 | davsclaus | 2012-01-27 08:06:54 -0500 (Fri, 27 Jan 2012) | 1 line Tighten up default uow. Unreigster from inflight before sending event. This also helps unit test with NotifyBuilder and checking inflight register is 0 when done. ................ r1237150 | bvahdat | 2012-01-28 14:56:05 -0500 (Sat, 28 Jan 2012) | 1 line Polished test. ................ r1237232 | bvahdat | 2012-01-29 05:15:09 -0500 (Sun, 29 Jan 2012) | 1 line Polished test. ................ r1237671 | davsclaus | 2012-01-30 09:23:50 -0500 (Mon, 30 Jan 2012) | 1 line CAMEL-4938: Fixed seda endpoint with JMX not being able to invoke certain methods. ................ r1237810 | davsclaus | 2012-01-30 12:26:56 -0500 (Mon, 30 Jan 2012) | 1 line CAMEL-4938: Fixed seda endpoint with JMX not being able to invoke certain methods. ................ r1238063 | bvahdat | 2012-01-30 17:49:45 -0500 (Mon, 30 Jan 2012) | 1 line CAMEL-4938: Undo the unintended changes with Thread.sleep() and enableJMX() calls. ................ r1238239 | davsclaus | 2012-01-31 03:20:23 -0500 (Tue, 31 Jan 2012) | 1 line CAMEL-4958: Added spring errorHandler to JMS listener, to avoid Spring complaining, and allow to configure logging levels to tune verbosity. ................ r1238242 | davsclaus | 2012-01-31 03:21:55 -0500 (Tue, 31 Jan 2012) | 1 line CAMEL-4958: Added spring errorHandler to JMS listener, to avoid Spring complaining, and allow to configure logging levels to tune verbosity. ................ r1238389 | davsclaus | 2012-01-31 05:51:30 -0500 (Tue, 31 Jan 2012) | 1 line CAMEL-4962: Added messageId to MDC logging ................ r1238481 | davsclaus | 2012-01-31 08:06:39 -0500 (Tue, 31 Jan 2012) | 1 line CAMEL-4961: Added isTransactedRedelivered to Exchange, which allows to better track redelivered messages, from ex JMS brokers. Makes easier to correlate in logs and whatnot. Improved TX logging in TransactedErrorHandler. Polished the scala RichExchange as well, as slight API change in Exchange. ................ r1238483 | davsclaus | 2012-01-31 08:08:49 -0500 (Tue, 31 Jan 2012) | 1 line CAMEL-4961: Added isTransactedRedelivered to Exchange, which allows to better track redelivered messages, from ex JMS brokers. Makes easier to correlate in logs and whatnot. Improved TX logging in TransactedErrorHandler. Polished the scala RichExchange as well, as slight API change in Exchange. ................ r1238508 | davsclaus | 2012-01-31 08:29:18 -0500 (Tue, 31 Jan 2012) | 1 line CAMEL-4961: Polished ................ r1238990 | davsclaus | 2012-02-01 03:02:23 -0500 (Wed, 01 Feb 2012) | 1 line CAMEL-4961: Improved test ................ r1239007 | davsclaus | 2012-02-01 03:47:05 -0500 (Wed, 01 Feb 2012) | 1 line Upgraded to CXF 2.5.2 ................ r1239046 | davsclaus | 2012-02-01 05:46:03 -0500 (Wed, 01 Feb 2012) | 1 line CAMEL-4965: Allow to configure transaction error handler rollback logging level. ................ r1239110 | davsclaus | 2012-02-01 07:52:13 -0500 (Wed, 01 Feb 2012) | 1 line camel-jms is now less noisy in its logging by default. ................ r1239113 | davsclaus | 2012-02-01 07:56:08 -0500 (Wed, 01 Feb 2012) | 1 line CAMEL-4965: Allow to configure transaction error handler rollback logging level. ................ r1239471 | davsclaus | 2012-02-02 02:09:23 -0500 (Thu, 02 Feb 2012) | 1 line CAMEL-4961: Keep information about transacted redelivered for the lifecycle of the exchange. As the impl of Message can change during routing, and otherwise lose that detail. ................ r1239510 | davsclaus | 2012-02-02 04:48:58 -0500 (Thu, 02 Feb 2012) | 1 line CAMEL-4968: Expose transacted redeliveries as JMX stat ................ r1239511 | davsclaus | 2012-02-02 04:54:49 -0500 (Thu, 02 Feb 2012) | 1 line CAMEL-4968: Renamed transacted redeliveries to external redeliveries ................ r1240066 | davsclaus | 2012-02-03 05:33:03 -0500 (Fri, 03 Feb 2012) | 1 line CAMEL-4961: Improved TX commit/rollback logging a bit ................ r1240146 | jbonofre | 2012-02-03 07:57:09 -0500 (Fri, 03 Feb 2012) | 1 line [CAMEL-4972] Remove h2database dependency ................ r1240187 | hadrian | 2012-02-03 09:23:22 -0500 (Fri, 03 Feb 2012) | 1 line CAMEL-4954. Fix for double decoding of % in uris ................ r1240681 | jbonofre | 2012-02-05 03:36:45 -0500 (Sun, 05 Feb 2012) | 1 line [CAMEL-4977] Upgrade to Krati 0.4.3 ................ r1240771 | jbonofre | 2012-02-05 12:57:03 -0500 (Sun, 05 Feb 2012) | 1 line [CAMEL-4979] Upgrade to hsqldb 2.2.8 ................ r1240793 | jbonofre | 2012-02-05 15:04:03 -0500 (Sun, 05 Feb 2012) | 1 line [CAMEL-4981] Upgrade to jruby 1.6.6 ................ r1241258 | hadrian | 2012-02-06 18:26:30 -0500 (Mon, 06 Feb 2012) | 1 line CAMEL-4976. Test showing problem with Context.removeEndpoints(String) ................ r1241259 | hadrian | 2012-02-06 18:26:38 -0500 (Mon, 06 Feb 2012) | 1 line Fix checkstyle and dependency problem from previous commit ................ r1241260 | hadrian | 2012-02-06 18:26:48 -0500 (Mon, 06 Feb 2012) | 1 line CAMEL-4976. Properly remove all endpoints matching a given pattern ................ r1241332 | hadrian | 2012-02-06 21:41:30 -0500 (Mon, 06 Feb 2012) | 1 line Fix CS ................ r1241496 | bvahdat | 2012-02-07 10:45:58 -0500 (Tue, 07 Feb 2012) | 1 line CAMEL-4986: ManagedPerformanceCounterMBean should extend ManagedCounterMBean. ................ r1241501 | bvahdat | 2012-02-07 10:49:57 -0500 (Tue, 07 Feb 2012) | 1 line revert the previous commit which lacks the svn:merge info. ................ r1241504 | bvahdat | 2012-02-07 10:57:04 -0500 (Tue, 07 Feb 2012) | 1 line CAMEL-4986: ManagedPerformanceCounterMBean should extend ManagedCounterMBean. ................ r1241779 | ningjiang | 2012-02-08 00:37:39 -0500 (Wed, 08 Feb 2012) | 9 lines Merged revisions 1241485 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1241485 | bvahdat | 2012-02-07 23:17:57 +0800 (Tue, 07 Feb 2012) | 1 line CAMEL-4986: ManagedPerformanceCounterMBean should extend ManagedCounterMBean. ........ ................ r1241790 | bvahdat | 2012-02-08 02:11:05 -0500 (Wed, 08 Feb 2012) | 1 line Avoid NPE in the case getComponent(name) returns null. ................ r1242581 | hadrian | 2012-02-09 17:45:32 -0500 (Thu, 09 Feb 2012) | 33 lines 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. ........ ................ r1242582 | hadrian | 2012-02-09 17:46:29 -0500 (Thu, 09 Feb 2012) | 88 lines Blocked revisions 1235634,1235669,1235687,1235706,1235715,1235717,1235979,1236083,1236477,1236487,1236494,1236567,1236615,1237049,1237052,1237148,1237230,1237240,1237381,1237603,1238145 via svnmerge ........ r1235634 | davsclaus | 2012-01-25 00:43:47 -0500 (Wed, 25 Jan 2012) | 1 line CAMEL-4932: camel-twitter improvements. Applied patch from Bilgin. ........ r1235669 | davsclaus | 2012-01-25 02:54:10 -0500 (Wed, 25 Jan 2012) | 1 line CAMEL-4939: Moved CamelSpringTestSupport from camel-test to camel-test-spring. ........ r1235687 | davsclaus | 2012-01-25 03:44:33 -0500 (Wed, 25 Jan 2012) | 1 line CAMEL-4940: Camel archetypes. Should use camel-test-spring for spring testing if needed. ........ r1235706 | davsclaus | 2012-01-25 04:55:41 -0500 (Wed, 25 Jan 2012) | 1 line CAMEL-4940: Polished Camel maven archetypes. Now include src/test directory and being ready for unit testing etc. ........ r1235715 | davsclaus | 2012-01-25 05:43:11 -0500 (Wed, 25 Jan 2012) | 1 line CAMEL-4939: polsihed pom ........ r1235717 | davsclaus | 2012-01-25 06:14:10 -0500 (Wed, 25 Jan 2012) | 1 line Upgraded to AHC 1.7.0 ........ r1235979 | bvahdat | 2012-01-25 17:52:01 -0500 (Wed, 25 Jan 2012) | 1 line Fixed CS ........ r1236083 | davsclaus | 2012-01-26 03:55:56 -0500 (Thu, 26 Jan 2012) | 1 line CAMEL-4943: Upgraded to Shrio 1.2.0 ........ r1236477 | hadrian | 2012-01-26 19:57:50 -0500 (Thu, 26 Jan 2012) | 1 line Fix failing test due to missing dependency ........ r1236487 | hadrian | 2012-01-26 20:30:20 -0500 (Thu, 26 Jan 2012) | 1 line Fix failing test due to missing dependency ........ r1236494 | hadrian | 2012-01-26 21:12:48 -0500 (Thu, 26 Jan 2012) | 1 line Fix failing test due to missing dependency ........ r1236567 | davsclaus | 2012-01-27 03:10:06 -0500 (Fri, 27 Jan 2012) | 1 line Fixed test ........ r1236615 | davsclaus | 2012-01-27 04:24:13 -0500 (Fri, 27 Jan 2012) | 1 line Fixed archetype ........ r1237049 | davsclaus | 2012-01-28 06:50:03 -0500 (Sat, 28 Jan 2012) | 1 line CAMEL-4944: New camel-gson data format. Thanks to Denis Bardadym for contributioon ........ r1237052 | davsclaus | 2012-01-28 07:19:34 -0500 (Sat, 28 Jan 2012) | 1 line CAMEL-4944: Added camel-gson to osgi features ........ r1237148 | bvahdat | 2012-01-28 14:45:21 -0500 (Sat, 28 Jan 2012) | 1 line Polished test. ........ r1237230 | bvahdat | 2012-01-29 05:06:51 -0500 (Sun, 29 Jan 2012) | 1 line Polished test. ........ r1237240 | davsclaus | 2012-01-29 05:54:45 -0500 (Sun, 29 Jan 2012) | 1 line Fixed CS ........ r1237381 | bvahdat | 2012-01-29 12:36:06 -0500 (Sun, 29 Jan 2012) | 1 line Renamed to ManagedBrowsableEndpointXXX instead of ManagedBrowseableEndpointXXX. ........ r1237603 | davsclaus | 2012-01-30 06:12:49 -0500 (Mon, 30 Jan 2012) | 1 line CAMEL-4713: New camel-ssh component. Thanks to Scott and Jason for their contribution. ........ r1238145 | davsclaus | 2012-01-30 23:52:01 -0500 (Mon, 30 Jan 2012) | 1 line Upgraded to Jasypt 1.8 ........ ................ r1242621 | hadrian | 2012-02-09 19:33:56 -0500 (Thu, 09 Feb 2012) | 9 lines Merged revisions 1235718 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1235718 | davsclaus | 2012-01-25 06:16:08 -0500 (Wed, 25 Jan 2012) | 1 line CAMEL-4937: Specified the encoding to be UTF-8 by the Camel maven archetypes so that maven doesn't WARN about platform dependent encoding, also polished all the POMs ........ ................ r1242623 | hadrian | 2012-02-09 19:39:31 -0500 (Thu, 09 Feb 2012) | 9 lines Merged revisions 1236325 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1236325 | hadrian | 2012-01-26 12:53:32 -0500 (Thu, 26 Jan 2012) | 1 line Fix for test with intermittent timing related failures ........ ................ r1242624 | hadrian | 2012-02-09 19:41:07 -0500 (Thu, 09 Feb 2012) | 9 lines Merged revisions 1236680 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1236680 | davsclaus | 2012-01-27 08:41:58 -0500 (Fri, 27 Jan 2012) | 1 line CAMEL-4941: Polished javadoc ........ ................ r1242634 | hadrian | 2012-02-09 20:39:44 -0500 (Thu, 09 Feb 2012) | 9 lines Merged revisions 1237241 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1237241 | davsclaus | 2012-01-29 06:07:57 -0500 (Sun, 29 Jan 2012) | 1 line CAMEL-4950: Do not continue routing exchanges if graceful shutdown is in progress and timeout occurred so we should shutdown more aggressively, to prevent the content from appearing stuck. Or if we have long lasting redelivery attempts that make it appear as stuck. ........ ................ r1242644 | hadrian | 2012-02-09 22:06:53 -0500 (Thu, 09 Feb 2012) | 9 lines Merged revisions 1237367 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1237367 | bvahdat | 2012-01-29 12:22:41 -0500 (Sun, 29 Jan 2012) | 1 line Polished. ........ ................ r1242651 | hadrian | 2012-02-09 22:40:34 -0500 (Thu, 09 Feb 2012) | 37 lines Recorded merge of revisions 1239507-1239531,1239533-1239622,1239624-1240024,1240026-1240062,1240064-1240070,1240072-1240086,1240088-1240350,1240352-1240365,1240367-1240371,1240373,1240375,1240377-1240575,1240578-1240691,1240693-1240695 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1239507 | jbonofre | 2012-02-02 04:37:02 -0500 (Thu, 02 Feb 2012) | 1 line [CAMEL-4280] Fix OSGi version used in core ........ r1240015 | hadrian | 2012-02-03 02:14:21 -0500 (Fri, 03 Feb 2012) | 1 line CAMEL-4954. Fix for double decoding of % in uris ........ r1240067 | davsclaus | 2012-02-03 05:34:07 -0500 (Fri, 03 Feb 2012) | 1 line Log to file ........ r1240144 | jbonofre | 2012-02-03 07:51:45 -0500 (Fri, 03 Feb 2012) | 1 line [CAMEL-4972] Remove h2database dependency ........ r1240392 | hadrian | 2012-02-03 18:20:44 -0500 (Fri, 03 Feb 2012) | 1 line CAMEL-4976. Test showing problem with Context.removeEndpoints(String) ........ r1240408 | hadrian | 2012-02-03 18:46:27 -0500 (Fri, 03 Feb 2012) | 1 line Fix checkstyle and dependency problem from previous commit ........ r1240679 | jbonofre | 2012-02-05 03:35:10 -0500 (Sun, 05 Feb 2012) | 1 line [CAMEL-4977] Upgrade to Krati 0.4.3 ........ r1240695 | bvahdat | 2012-02-05 06:10:38 -0500 (Sun, 05 Feb 2012) | 1 line Fixed CS. ........ ................ r1242653 | hadrian | 2012-02-09 22:41:37 -0500 (Thu, 09 Feb 2012) | 103 lines Blocked revisions 1235707,1235727,1235971,1236249,1237372,1237570,1237681,1238147,1238149,1239623,1240071,1240087,1240351,1240366,1240372,1240576-1240577,1240692,1240698,1240705,1240709,1240712,1240730,1240735 via svnmerge ........ r1235707 | davsclaus | 2012-01-25 05:12:42 -0500 (Wed, 25 Jan 2012) | 1 line CAMEL-4940: Added versions to plugin so no WARN from maven. ........ r1235727 | davsclaus | 2012-01-25 07:46:40 -0500 (Wed, 25 Jan 2012) | 1 line CAMEL-4940: Polished ........ r1235971 | bvahdat | 2012-01-25 17:29:20 -0500 (Wed, 25 Jan 2012) | 1 line Polished ........ r1236249 | davsclaus | 2012-01-26 10:41:08 -0500 (Thu, 26 Jan 2012) | 1 line CAMEL-4946: Added JMX methods to dump performance stats in one JMX call and output detail in XML format. ........ r1237372 | bvahdat | 2012-01-29 12:30:22 -0500 (Sun, 29 Jan 2012) | 1 line Polished. ........ r1237570 | davsclaus | 2012-01-30 03:39:25 -0500 (Mon, 30 Jan 2012) | 1 line CAMEL-4953: Added ShutdownPrepare interface to allow Services in routes to do custom shutdown logic. For example the Aggregate EIP. ........ r1237681 | davsclaus | 2012-01-30 09:34:35 -0500 (Mon, 30 Jan 2012) | 1 line svn ignore ........ r1238147 | davsclaus | 2012-01-30 23:56:26 -0500 (Mon, 30 Jan 2012) | 1 line Polished ........ r1238149 | davsclaus | 2012-01-31 00:36:09 -0500 (Tue, 31 Jan 2012) | 1 line CAMEL-4957: camel-archetype-java is now a pure Java based project. Thanks to Bilgin for the patch. Polished ReadMe.txt in archetypes. ........ r1239623 | davsclaus | 2012-02-02 09:01:14 -0500 (Thu, 02 Feb 2012) | 1 line CAMEL-4971: Added camelId to simple language as a known function ........ r1240071 | cmoulliard | 2012-02-03 05:47:53 -0500 (Fri, 03 Feb 2012) | 1 line Add a first camel unit test for websocket ........ r1240087 | cmoulliard | 2012-02-03 06:28:13 -0500 (Fri, 03 Feb 2012) | 1 line Add a first camel unit test for websocket ........ r1240351 | iocanel | 2012-02-03 16:41:13 -0500 (Fri, 03 Feb 2012) | 4 lines Merge branch 'trunk' of git://git.apache.org/camel into trunk-avro Conflicts: components/pom.xml ........ r1240366 | iocanel | 2012-02-03 16:59:51 -0500 (Fri, 03 Feb 2012) | 1 line [CAMEL-4859] Added missing license header to camel-avro pom.xml ........ r1240372 | hadrian | 2012-02-03 17:12:22 -0500 (Fri, 03 Feb 2012) | 1 line Remove extra addition from a previous commit that breaks builds ........ r1240576 | iocanel | 2012-02-04 13:20:59 -0500 (Sat, 04 Feb 2012) | 1 line [CAMEL-4859] Upgraded avro bundles to 1.6.1_2 snapshot, since the 1.6.1_1 version of the bundles contain conflicting package exports. ........ r1240577 | iocanel | 2012-02-04 13:23:18 -0500 (Sat, 04 Feb 2012) | 1 line [CAMEL-4859] Fixed possible NPE during avro component initiallization. ........ r1240692 | davsclaus | 2012-02-05 05:04:28 -0500 (Sun, 05 Feb 2012) | 1 line CAMEL-4964: New camel-beanio component. Thanks to James Lucas for the contribution. ........ r1240698 | davsclaus | 2012-02-05 06:23:35 -0500 (Sun, 05 Feb 2012) | 1 line CAMEL-4964: Improved camel-beanio, added to kit etc. ........ r1240705 | iocanel | 2012-02-05 06:52:08 -0500 (Sun, 05 Feb 2012) | 1 line [CAMEL-4859] Reverted to 1.6.1_1 version of the avro bundle. ........ r1240709 | davsclaus | 2012-02-05 07:40:42 -0500 (Sun, 05 Feb 2012) | 1 line Added components to kit. Polished ........ r1240712 | davsclaus | 2012-02-05 07:59:29 -0500 (Sun, 05 Feb 2012) | 1 line Polished. Fixed CS. ........ r1240730 | davsclaus | 2012-02-05 08:44:38 -0500 (Sun, 05 Feb 2012) | 1 line CAMEL-4964: Fixed test ........ r1240735 | bvahdat | 2012-02-05 08:53:14 -0500 (Sun, 05 Feb 2012) | 1 line Polished. ........ ................ r1242654 | hadrian | 2012-02-09 22:43:46 -0500 (Thu, 09 Feb 2012) | 9 lines Merged revisions 1237589 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1237589 | davsclaus | 2012-01-30 05:16:23 -0500 (Mon, 30 Jan 2012) | 1 line Polished ........ ................ Modified: camel/branches/camel-2.8.x/ (props changed) Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.
