You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/02/10 04:41:37 UTC
svn commit: r1242653 - /camel/branches/camel-2.9.x/

Author: hadrian
Date: Fri Feb 10 03:41:37 2012
New Revision: 1242653

URL: http://svn.apache.org/viewvc?rev=1242653&view=rev
Log:
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.
........

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

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