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/04/12 02:07:51 UTC
svn commit: r1325072 - /camel/branches/camel-2.9.x/

Author: hadrian
Date: Thu Apr 12 00:07:51 2012
New Revision: 1325072

URL: http://svn.apache.org/viewvc?rev=1325072&view=rev
Log:
Recorded merge of revisions 1308593-1309128,1309130-1309734,1309736-1309778,1309780-1309818,1309820-1309925,1309927-1309933,1309935-1309936,1309938,1309940-1309944,1309946-1310149,1310151,1310153-1310154,1310156-1310216,1310218-1310219,1310221,1310223-1310226,1310228-1310231,1310233-1310243,1310245-1310248,1310250-1310426,1310428-1310490,1310492-1310689,1310691-1310694,1310696-1310708,1310711-1310723,1310726-1310753,1310755-1310958,1310960-1310978,1310980-1310988,1310990-1310998,1311000-1311237,1311239-1311276,1311278-1311289,1311291-1311453,1311455-1311494,1311496-1311581,1311583-1311585,1311587-1311593,1311595-1311699,1311701-1311729,1311731,1311733-1311753,1311755-1311781,1311783-1311886,1311888-1324567,1324569-1324597,1324599-1324637,1324639-1324674,1324676-1325036 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1308593 | cmueller | 2012-04-02 18:01:41 -0400 (Mon, 02 Apr 2012) | 1 line
  
  CAMEL-3776: Add pooling support for JAXB data format
........
  r1309146 | cmueller | 2012-04-03 16:59:59 -0400 (Tue, 03 Apr 2012) | 1 line
  
  CAMEL-3776: Add pooling support for JAXB data format
........
  r1309261 | cmueller | 2012-04-04 02:23:55 -0400 (Wed, 04 Apr 2012) | 1 line
  
  CAMEL-3776: Add pooling support for JAXB data format
........
  r1309262 | cmueller | 2012-04-04 02:33:59 -0400 (Wed, 04 Apr 2012) | 1 line
  
  CAMEL-3776: Add pooling support for JAXB data format
........
  r1309588 | cmueller | 2012-04-04 16:46:05 -0400 (Wed, 04 Apr 2012) | 1 line
  
  CAMEL-3776: Add pooling support for JAXB data format
........
  r1309887 | dkulp | 2012-04-05 10:47:46 -0400 (Thu, 05 Apr 2012) | 4 lines
  
  [CAMEL-3776] Change from pooling to using XMLStreamReaders for
  everything which removes all the locks and much of the casting.
  NOTE: right now, this REQUIRES woodstox as the StAX parser as the in-jdk
  version is not thread safe in how StaxConverter uses it right now.
........
  r1310091 | cmueller | 2012-04-05 17:53:54 -0400 (Thu, 05 Apr 2012) | 1 line
  
  CAMEL-3776: Add pooling support for JAXB data format
........
  r1310151 | dkulp | 2012-04-05 21:37:05 -0400 (Thu, 05 Apr 2012) | 1 line
  
  The getUnmarshaller call no longer needs to be synchronized
........
  r1310380 | cmueller | 2012-04-06 11:03:26 -0400 (Fri, 06 Apr 2012) | 1 line
  
  CAMEL-3776: Add pooling support for JAXB data format
........
  r1325036 | cmueller | 2012-04-11 18:00:51 -0400 (Wed, 11 Apr 2012) | 1 line
  
  CAMEL-5161: If MyBatis experiences an error on commit (e.g. unique PK violation) it appears to hold the session open and cause DB writelock errors
........

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

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