You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 22:44:39 UTC
svn commit: r1172809 - /camel/branches/camel-2.8.x/

Author: dkulp
Date: Mon Sep 19 20:44:38 2011
New Revision: 1172809

URL: http://svn.apache.org/viewvc?rev=1172809&view=rev
Log:
Blocked revisions 1153148,1153158,1153168,1153324,1153355,1153374,1153819,1154743,1154748,1154892,1154933,1155232,1155319,1156481,1156526,1157157,1157183,1157189,1157356,1157367,1157369,1157519-1157520,1157727,1157732,1157751,1157824,1157948,1158130 via svnmerge

........
  r1153148 | ningjiang | 2011-08-02 10:44:52 -0400 (Tue, 02 Aug 2011) | 1 line
  
  Updated camel-itest-karaf to use karaf profile
........
  r1153158 | davsclaus | 2011-08-02 11:10:24 -0400 (Tue, 02 Aug 2011) | 1 line
  
  CAMEL-4249: Camel now check if managed object has Spring JMX annotations and use those, if not it fallback and use the default from camel-core.
........
  r1153168 | davsclaus | 2011-08-02 11:47:34 -0400 (Tue, 02 Aug 2011) | 1 line
  
  CAMEL-4249: Replacing Spring JMX annotations with Camel JMX annotations for the components.
........
  r1153324 | ningjiang | 2011-08-02 23:01:53 -0400 (Tue, 02 Aug 2011) | 1 line
  
  CAMEL-4294 using the dynmaic port
........
  r1153355 | davsclaus | 2011-08-03 02:07:25 -0400 (Wed, 03 Aug 2011) | 1 line
  
  CAMEL-4249: Remove not needed spring JMX dependency in pom.xml files.
........
  r1153374 | davsclaus | 2011-08-03 03:43:01 -0400 (Wed, 03 Aug 2011) | 1 line
  
  CAMEL-4249: Remove not needed spring JMX dependency in pom.xml files.
........
  r1153819 | davsclaus | 2011-08-04 06:01:53 -0400 (Thu, 04 Aug 2011) | 1 line
  
  CAMEL-4296: Added working unit test
........
  r1154743 | davsclaus | 2011-08-07 14:24:01 -0400 (Sun, 07 Aug 2011) | 1 line
  
  CAMEL-4031: resource based components no longer depend on Spring JARs.
........
  r1154748 | davsclaus | 2011-08-07 14:57:42 -0400 (Sun, 07 Aug 2011) | 1 line
  
  CAMEL-4031: resource based components no longer depend on Spring JARs.
........
  r1154892 | davsclaus | 2011-08-08 05:44:13 -0400 (Mon, 08 Aug 2011) | 1 line
  
  CAMEL-4031: Added test for loading xslt template over HTTP.
........
  r1154933 | davsclaus | 2011-08-08 07:53:01 -0400 (Mon, 08 Aug 2011) | 1 line
  
  CAMEL-4314: When tracing is enabled force ids on all the nodes to be assigned.
........
  r1155232 | ningjiang | 2011-08-09 02:56:35 -0400 (Tue, 09 Aug 2011) | 1 line
  
  CAMEL-4299 Added OSGi integration tests
........
  r1155319 | jbonofre | 2011-08-09 07:44:07 -0400 (Tue, 09 Aug 2011) | 1 line
  
  [CAMEL-4313] Upgrade to XStream 1.4
........
  r1156481 | ningjiang | 2011-08-11 00:20:10 -0400 (Thu, 11 Aug 2011) | 1 line
  
  clean up the camel-example pom.xml for the resource filtering
........
  r1156526 | cmoulliard | 2011-08-11 03:55:36 -0400 (Thu, 11 Aug 2011) | 1 line
  
  Add a new assertion condition to test size of the array
........
  r1157157 | davsclaus | 2011-08-12 11:32:50 -0400 (Fri, 12 Aug 2011) | 1 line
  
  CAMEL-4298: Adjust the ExecutorServiceManager and fix issues with EIP configuration and making API more similar to old API, and improving other things. Read more at the JIRA.
........
  r1157183 | davsclaus | 2011-08-12 12:42:19 -0400 (Fri, 12 Aug 2011) | 1 line
  
  CAMEL-4298: Lookup methods on ExecutorServiceManager no longer needed. Added custom ThreadPoolFactory test, and possible to configure in XML DSL.
........
  r1157189 | davsclaus | 2011-08-12 13:04:23 -0400 (Fri, 12 Aug 2011) | 1 line
  
  CAMEL-4298: Added ExecutorServiceStrategy to be backwards compatibile. Marked it as @deprecated. This ensures 3rd party components still work with future Camel releases.
........
  r1157356 | davsclaus | 2011-08-13 05:11:19 -0400 (Sat, 13 Aug 2011) | 1 line
  
  Removed not needed code as setProperties later does all the boiler plate configuration.
........
  r1157367 | davsclaus | 2011-08-13 07:03:59 -0400 (Sat, 13 Aug 2011) | 1 line
  
  Polished
........
  r1157369 | davsclaus | 2011-08-13 07:24:15 -0400 (Sat, 13 Aug 2011) | 1 line
  
  Removed dependency on log4j as its not needed by freemarker.
........
  r1157519 | davsclaus | 2011-08-14 07:51:04 -0400 (Sun, 14 Aug 2011) | 1 line
  
  CAMEL-4333: Added wereSentTo to NotifyBuilder.
........
  r1157520 | davsclaus | 2011-08-14 07:55:59 -0400 (Sun, 14 Aug 2011) | 1 line
  
  Fixed CS
........
  r1157727 | davsclaus | 2011-08-15 03:14:47 -0400 (Mon, 15 Aug 2011) | 1 line
  
  Fixed test on CI and using dynamic ports
........
  r1157732 | davsclaus | 2011-08-15 03:33:35 -0400 (Mon, 15 Aug 2011) | 1 line
  
  Upgraded to scalete 1.5.1
........
  r1157751 | davsclaus | 2011-08-15 05:50:19 -0400 (Mon, 15 Aug 2011) | 1 line
  
  Using dynamic ports in tests.
........
  r1157824 | ningjiang | 2011-08-15 08:41:16 -0400 (Mon, 15 Aug 2011) | 1 line
  
  Fixed the CS errors
........
  r1157948 | cmueller | 2011-08-15 14:57:37 -0400 (Mon, 15 Aug 2011) | 1 line
  
  Updated to the released SMX bundles
........
  r1158130 | davsclaus | 2011-08-16 02:48:31 -0400 (Tue, 16 Aug 2011) | 1 line
  
  Fixed camel-jcr feature.
........

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

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