svn commit: r1173270 - /camel/branches/camel-2.8.x/

[dk...@apache.org]

Author: dkulp
Date: Tue Sep 20 17:35:39 2011
New Revision: 1173270

URL: http://svn.apache.org/viewvc?rev=1173270&view=rev
Log:
Blocked revisions 1171178-1171179,1171215,1171270,1171275,1171364,1171368,1171397-1171399,1171430,1171446,1171469,1171471-1171472,1171490,1171618,1171709,1172210,1172414,1172504,1172558,1172565,1172594,1173101,1173127 via svnmerge

........
  r1171178 | cschneider | 2011-09-15 13:20:53 -0400 (Thu, 15 Sep 2011) | 1 line
  
  Avoid using builder in impl class
........
  r1171179 | cschneider | 2011-09-15 13:22:00 -0400 (Thu, 15 Sep 2011) | 1 line
  
  remove CamelConverter.toDefinition as it does not seem to be used and creates a cycle
........
  r1171215 | davsclaus | 2011-09-15 14:31:55 -0400 (Thu, 15 Sep 2011) | 1 line
  
  CAMEL-4028: Simple language can change function start/end tokens. Thanks to Taariq for the patch.
........
  r1171270 | hadrian | 2011-09-15 16:53:40 -0400 (Thu, 15 Sep 2011) | 1 line
  
  CAMEL-4455. Use valid URIs in camel-spring-ws
........
  r1171275 | hadrian | 2011-09-15 17:07:42 -0400 (Thu, 15 Sep 2011) | 1 line
  
  CAMEL-4425. Properly encode URI in camel-sql
........
  r1171364 | hadrian | 2011-09-15 23:01:36 -0400 (Thu, 15 Sep 2011) | 1 line
  
  CAMEL-4256. Add EndpointConfiguration interface (part 1)
........
  r1171368 | hadrian | 2011-09-15 23:09:06 -0400 (Thu, 15 Sep 2011) | 1 line
  
  CAMEL-4256. Add file missed in previous commit.
........
  r1171397 | ningjiang | 2011-09-16 02:22:38 -0400 (Fri, 16 Sep 2011) | 1 line
  
  CAMEL-4452 Added unit test for the WSDL only route
........
  r1171398 | ningjiang | 2011-09-16 02:23:06 -0400 (Fri, 16 Sep 2011) | 1 line
  
  CAMEL-4452 Fixed the CS error
........
  r1171399 | davsclaus | 2011-09-16 02:28:11 -0400 (Fri, 16 Sep 2011) | 1 line
  
  CAMEL-4028: Fixed tests by ensureing default function start/end tokens is set back after testing is done.
........
  r1171430 | cschneider | 2011-09-16 03:54:53 -0400 (Fri, 16 Sep 2011) | 1 line
  
  Moving some helper methods from converter to util and adding deprecated stubs
........
  r1171446 | cschneider | 2011-09-16 04:37:17 -0400 (Fri, 16 Sep 2011) | 1 line
  
  Fix in IOConverter
........
  r1171469 | cschneider | 2011-09-16 05:26:24 -0400 (Fri, 16 Sep 2011) | 1 line
  
  Fix in IOConverter
........
  r1171471 | ningjiang | 2011-09-16 05:28:44 -0400 (Fri, 16 Sep 2011) | 1 line
  
  Removed the unused imports in camel-cxf
........
  r1171472 | cschneider | 2011-09-16 05:29:02 -0400 (Fri, 16 Sep 2011) | 1 line
  
  Move ConfigurationHelper to impl as it needs access to impl classes and is not used out of impl
........
  r1171490 | cschneider | 2011-09-16 06:25:25 -0400 (Fri, 16 Sep 2011) | 1 line
  
  CAMEl-4457 Move types of the simple language to a new package simple.types to avoid dependency cycle
........
  r1171618 | cschneider | 2011-09-16 11:15:53 -0400 (Fri, 16 Sep 2011) | 1 line
  
  CAMEL-4458: Fix for failure in SpringAsyncDeadLetterChannelExecutorServiceRefTest
........
  r1171709 | dkulp | 2011-09-16 14:36:26 -0400 (Fri, 16 Sep 2011) | 1 line
  
  Remove some warnings in eclipse
........
  r1172210 | davsclaus | 2011-09-18 03:37:51 -0400 (Sun, 18 Sep 2011) | 1 line
  
  CAMEL-4461: Added hazelcast osgi test. Thanks to Ioannis for the patch.
........
  r1172414 | ningjiang | 2011-09-18 23:11:26 -0400 (Sun, 18 Sep 2011) | 1 line
  
  CAMEL-4463 Add OSGi integration test for camel-jpa
........
  r1172504 | davsclaus | 2011-09-19 03:57:20 -0400 (Mon, 19 Sep 2011) | 1 line
  
  Upgraded to scalate 1.5.2
........
  r1172558 | cschneider | 2011-09-19 06:25:01 -0400 (Mon, 19 Sep 2011) | 1 line
  
  CAMEL-4464 Resolve cycle between processor and sub packages
........
  r1172565 | cschneider | 2011-09-19 06:55:28 -0400 (Mon, 19 Sep 2011) | 1 line
  
  Fix for checkstyle errors
........
  r1172594 | cschneider | 2011-09-19 08:41:10 -0400 (Mon, 19 Sep 2011) | 1 line
  
  Avoid accessing PredicateBuilder.toExpression from other packages by offering this method in a util class
........
  r1173101 | davsclaus | 2011-09-20 08:07:58 -0400 (Tue, 20 Sep 2011) | 1 line
  
  Polished
........
  r1173127 | davsclaus | 2011-09-20 09:01:20 -0400 (Tue, 20 Sep 2011) | 1 line
  
  CAMEL-4469: Added TimerListener and TimerListenerManager to make it easier to register scheduled background tasks
........

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

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