svn commit: r1308517 - /camel/branches/camel-2.9.x/

[ha...@apache.org]

Author: hadrian
Date: Mon Apr  2 20:02:23 2012
New Revision: 1308517

URL: http://svn.apache.org/viewvc?rev=1308517&view=rev
Log:
Blocked revisions 1298785,1301364,1302108,1302329,1302353,1302357,1302480,1303353,1303558,1303707,1303941,1304076,1304300,1305013,1305036,1305042,1305069-1305070,1305121,1305332,1305365,1305425,1305505,1305773,1305785,1305792,1306439,1307578,1307636,1307788,1307815,1307824,1308116,1308165,1308211,1308217 via svnmerge

........
  r1298785 | davsclaus | 2012-03-09 05:44:48 -0500 (Fri, 09 Mar 2012) | 1 line
  
  Fixed test on slower boxes
........
  r1301364 | davsclaus | 2012-03-16 04:08:45 -0400 (Fri, 16 Mar 2012) | 1 line
  
  Fixed test
........
  r1302108 | davsclaus | 2012-03-18 06:17:02 -0400 (Sun, 18 Mar 2012) | 1 line
  
  Added snippet for documentation
........
  r1302329 | davsclaus | 2012-03-19 04:58:23 -0400 (Mon, 19 Mar 2012) | 1 line
  
  Added README.txt to example.
........
  r1302353 | davsclaus | 2012-03-19 05:55:17 -0400 (Mon, 19 Mar 2012) | 1 line
  
  Polished features. Enabled camel-dns, as people can use it on SUN JVMs, if they adjust their jre.properties
........
  r1302357 | davsclaus | 2012-03-19 06:04:51 -0400 (Mon, 19 Mar 2012) | 1 line
  
  Added details about camel-dns requires SUN JVM and what to do before using.
........
  r1302480 | hadrian | 2012-03-19 10:43:08 -0400 (Mon, 19 Mar 2012) | 1 line
  
  CS fix
........
  r1303353 | davsclaus | 2012-03-21 06:33:01 -0400 (Wed, 21 Mar 2012) | 1 line
  
  Added test based on user forum issue
........
  r1303558 | davsclaus | 2012-03-21 16:24:39 -0400 (Wed, 21 Mar 2012) | 1 line
  
  Added some osgi karaf test
........
  r1303707 | cmueller | 2012-03-22 06:03:28 -0400 (Thu, 22 Mar 2012) | 1 line
  
  CAMEL-4778: Upgrade Spring to 3.1.1.RELEASE - added a spring3.1 profile
........
  r1303941 | hadrian | 2012-03-22 14:08:04 -0400 (Thu, 22 Mar 2012) | 1 line
  
  Update avro tests to use the junit4 based camel test support
........
  r1304076 | hadrian | 2012-03-22 17:25:58 -0400 (Thu, 22 Mar 2012) | 1 line
  
  Remove unneeded (duplicate) tests. Minor fix for unused field.
........
  r1304300 | cmueller | 2012-03-23 08:12:58 -0400 (Fri, 23 Mar 2012) | 3 lines
  
  Revert "[CAMEL-4987] Minor documentation tweaks and fix of a false positive unit test in Spring Test support."
  
  [CAMEL-4987] Reverting changes which are impossible to use with Spring 3.0 and 3.1
........
  r1305013 | davsclaus | 2012-03-25 07:57:50 -0400 (Sun, 25 Mar 2012) | 1 line
  
  CAMEL-5117: You can now configure twitter settings on twitter component level. Made the example run out of the box.
........
  r1305036 | davsclaus | 2012-03-25 09:51:07 -0400 (Sun, 25 Mar 2012) | 1 line
  
  CAMEL-5117: Polished. Made it a bit easier with camel-twitter as you can configure sendToAll on endpoint.
........
  r1305042 | davsclaus | 2012-03-25 10:12:18 -0400 (Sun, 25 Mar 2012) | 1 line
  
  CAMEL-5003: Added support for generated keys in camel-jdbc. Thanks to Thomas Gueze for the patch.
........
  r1305069 | cmueller | 2012-03-25 12:14:46 -0400 (Sun, 25 Mar 2012) | 3 lines
  
  Revert "Revert "[CAMEL-4987] Minor documentation tweaks and fix of a false positive unit test in Spring Test support.""
  
  This reverts commit ad7e43430927bfa41f22405a10c6c8e647331897.
........
  r1305070 | cmueller | 2012-03-25 12:14:52 -0400 (Sun, 25 Mar 2012) | 1 line
  
  CAMEL-4778: Upgrade Spring to 3.1.1.RELEASE
........
  r1305121 | cmueller | 2012-03-25 16:40:40 -0400 (Sun, 25 Mar 2012) | 1 line
  
  CAMEL-4955: Camel should run in a Java 7 environment
........
  r1305332 | davsclaus | 2012-03-26 08:32:10 -0400 (Mon, 26 Mar 2012) | 1 line
  
  CAMEL-4160: Added retainFirst and retainLast option to mock component.
........
  r1305365 | davsclaus | 2012-03-26 10:10:47 -0400 (Mon, 26 Mar 2012) | 1 line
  
  CAMEL-4160: Polished dataset component. Optimized to not need for copy exchange, which helps reduce memory usage.
........
  r1305425 | dvaleri | 2012-03-26 12:17:22 -0400 (Mon, 26 Mar 2012) | 1 line
  
  [CAMEL-4987] Implemented new methods for Spring 3.1.
........
  r1305505 | dkulp | 2012-03-26 15:27:00 -0400 (Mon, 26 Mar 2012) | 1 line
  
  Add a profile to help testing with CXF 2.6.x
........
  r1305773 | davsclaus | 2012-03-27 04:25:54 -0400 (Tue, 27 Mar 2012) | 1 line
  
  CAMEL-5121: Added support class for lifecycle strategy.
........
  r1305785 | davsclaus | 2012-03-27 05:12:02 -0400 (Tue, 27 Mar 2012) | 1 line
  
  CAMEL-5118: Upgraded to jclouds 1.4.0
........
  r1305792 | davsclaus | 2012-03-27 05:41:43 -0400 (Tue, 27 Mar 2012) | 1 line
  
  Polished
........
  r1306439 | davsclaus | 2012-03-28 11:44:48 -0400 (Wed, 28 Mar 2012) | 1 line
  
  Allow to load static resources from classpath with camel-websocket. Polished the twitter example.
........
  r1307578 | hadrian | 2012-03-30 15:23:02 -0400 (Fri, 30 Mar 2012) | 1 line
  
  CS fixes
........
  r1307636 | hadrian | 2012-03-30 18:06:21 -0400 (Fri, 30 Mar 2012) | 1 line
  
  Remove warnings. Minor fixes
........
  r1307788 | davsclaus | 2012-03-31 08:23:22 -0400 (Sat, 31 Mar 2012) | 1 line
  
  CAMEL-4160: Added retainFirst and retainLast option to mock component.
........
  r1307815 | davsclaus | 2012-03-31 10:32:43 -0400 (Sat, 31 Mar 2012) | 1 line
  
  CAMEL-5050: Added camel-leveldb component. Thanks to Jason Sherman for the patch.
........
  r1307824 | davsclaus | 2012-03-31 11:12:13 -0400 (Sat, 31 Mar 2012) | 1 line
  
  Fixed so features.xml can be validated.
........
  r1308116 | davsclaus | 2012-04-01 09:46:38 -0400 (Sun, 01 Apr 2012) | 1 line
  
  CAMEL-4160: Added retainFirst and retainLast option to mock component.
........
  r1308165 | cmueller | 2012-04-01 14:06:54 -0400 (Sun, 01 Apr 2012) | 1 line
  
  CAMEL-3776: Add pooling support for JAXB data format
........
  r1308211 | rickette | 2012-04-01 19:02:41 -0400 (Sun, 01 Apr 2012) | 1 line
  
  CAMEL-5135: support for JSON views in Jackson and  ExclusionStrategy's in GSON
........
  r1308217 | rickette | 2012-04-01 19:14:55 -0400 (Sun, 01 Apr 2012) | 1 line
  
  CAMEL-5135: polishing
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.