camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r1235618 - /camel/branches/camel-2.8.x/
Date Wed, 25 Jan 2012 03:35:28 GMT
Author: hadrian
Date: Wed Jan 25 03:35:28 2012
New Revision: 1235618

URL: http://svn.apache.org/viewvc?rev=1235618&view=rev
Log:
Blocked revisions 1235615-1235616 via svnmerge

................
  r1235615 | hadrian | 2012-01-24 22:31:48 -0500 (Tue, 24 Jan 2012) | 41 lines
  
  Recorded merge of revisions 1234609-1234764,1234766-1234770,1234772,1234774-1234804,1234806-1234808,1234810-1234816,1234818-1234827,1234829-1234843,1234845-1234846,1234848,1234850-1234884,1234886-1234965,1234967-1235026,1235028-1235030,1235032-1235047,1235049-1235071
via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1234609 | cmueller | 2012-01-22 16:16:20 -0500 (Sun, 22 Jan 2012) | 1 line
    
    CAMEL-4804: Add replyTo option to camel mail component
  ........
    r1234627 | cmueller | 2012-01-22 17:02:52 -0500 (Sun, 22 Jan 2012) | 1 line
    
    CAMEL-4804: Add replyTo option to camel mail component
  ........
    r1234937 | hadrian | 2012-01-23 14:11:05 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Generated log files should go under target/
  ........
    r1234946 | hadrian | 2012-01-23 14:46:35 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Log file should go under target/
  ........
    r1234955 | hadrian | 2012-01-23 14:55:56 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Log file should go under target/
  ........
    r1235043 | hadrian | 2012-01-23 17:37:21 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Log file should go in target/
  ........
    r1235055 | hadrian | 2012-01-23 18:13:32 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Log file should go in target/
  ........
    r1235070 | hadrian | 2012-01-23 18:45:26 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Polish
  ........
    r1235071 | hadrian | 2012-01-23 18:45:32 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Log file should go in target/
  ........
................
  r1235616 | hadrian | 2012-01-24 22:32:55 -0500 (Tue, 24 Jan 2012) | 112 lines
  
  Blocked revisions 1234489,1234765,1234771,1234773,1234805,1234809,1234817,1234828,1234844,1234847,1234849,1234885,1234966,1235027,1235031,1235048,1235134,1235186,1235213,1235218,1235225,1235242,1235265,1235281,1235316,1235456,1235458
via svnmerge
  
  ........
    r1234489 | bvahdat | 2012-01-22 06:32:20 -0500 (Sun, 22 Jan 2012) | 1 line
    
    CAMEL-4924: Now the camel-mina2 unit-tests all pass (and don't hang anymore!) on Windows
as well
  ........
    r1234765 | davsclaus | 2012-01-23 07:37:51 -0500 (Mon, 23 Jan 2012) | 1 line
    
    CAMEL-4925: Threads EIP now better suppports rejected tasks to ensure exchange gets done,
for example to de-register the exchange in the inflight registry. Thanks to Sergey Zhemzhitsky
for the patch.
  ........
    r1234771 | davsclaus | 2012-01-23 08:01:11 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Fixed test
  ........
    r1234773 | davsclaus | 2012-01-23 08:07:54 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Fixed test on slow servers
  ........
    r1234805 | davsclaus | 2012-01-23 09:11:24 -0500 (Mon, 23 Jan 2012) | 1 line
    
    CAMEL-4914: Make it easier for end users to use camel-test-blueprint, to specify the location
of the XML file.
  ........
    r1234809 | davsclaus | 2012-01-23 09:18:55 -0500 (Mon, 23 Jan 2012) | 1 line
    
    CAMEL-4914: Polished
  ........
    r1234817 | davsclaus | 2012-01-23 09:27:11 -0500 (Mon, 23 Jan 2012) | 1 line
    
    CAMEL-4914: Polished pom.xml
  ........
    r1234828 | davsclaus | 2012-01-23 09:48:26 -0500 (Mon, 23 Jan 2012) | 1 line
    
    CAMEL-4914: Ensure all stuff is stored in target directory.
  ........
    r1234844 | bvahdat | 2012-01-23 10:14:39 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Avoid compiler warnings
  ........
    r1234847 | bvahdat | 2012-01-23 10:18:18 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Corrected a comment
  ........
    r1234849 | bvahdat | 2012-01-23 10:19:30 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Corrected a comment
  ........
    r1234885 | davsclaus | 2012-01-23 11:28:43 -0500 (Mon, 23 Jan 2012) | 1 line
    
    CAMEL-4914: Improved blueprint archetype for using camel-test-blueprint.
  ........
    r1234966 | bvahdat | 2012-01-23 15:08:41 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Introduced another overloaded IOHelper.close() variant with varargs and it's usage (shorthand-writing)
  ........
    r1235027 | bvahdat | 2012-01-23 17:13:42 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Do reuse the provided IOHelper.buffered() methods which would also prevent possible double-buffering
in some corner cases
  ........
    r1235031 | bvahdat | 2012-01-23 17:18:57 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Removed the comment out of the assertEquals() test
  ........
    r1235048 | bvahdat | 2012-01-23 17:49:19 -0500 (Mon, 23 Jan 2012) | 1 line
    
    Avoid the (direct) usage of log4j API
  ........
    r1235134 | davsclaus | 2012-01-24 01:05:23 -0500 (Tue, 24 Jan 2012) | 1 line
    
    CAMEL-4933: CamelTestSupport should not have Spring JAR dependency.
  ........
    r1235186 | davsclaus | 2012-01-24 04:31:52 -0500 (Tue, 24 Jan 2012) | 1 line
    
    Fixed test
  ........
    r1235213 | davsclaus | 2012-01-24 06:43:22 -0500 (Tue, 24 Jan 2012) | 1 line
    
    Fixed test
  ........
    r1235218 | davsclaus | 2012-01-24 07:11:12 -0500 (Tue, 24 Jan 2012) | 1 line
    
    Sorted
  ........
    r1235225 | davsclaus | 2012-01-24 07:43:25 -0500 (Tue, 24 Jan 2012) | 1 line
    
    CAMEL-4934: Moved CamelBeanPostProcessor from camel-spring to camel-core, to make it reusable
by others. Ensure CamelTestSupport and camel-test-blueprint can run and do Camel @EndpointInjection
without Spring JARs on classpath.
  ........
    r1235242 | davsclaus | 2012-01-24 08:21:23 -0500 (Tue, 24 Jan 2012) | 1 line
    
    CAMEL-4934: Moved CamelBeanPostProcessor from camel-spring to camel-core, to make it reusable
by others. Ensure CamelTestSupport and camel-test-blueprint can run and do Camel @EndpointInjection
without Spring JARs on classpath.
  ........
    r1235265 | davsclaus | 2012-01-24 09:30:03 -0500 (Tue, 24 Jan 2012) | 1 line
    
    CAMEL-4888: Exclude camel-spring as not needed.
  ........
    r1235281 | davsclaus | 2012-01-24 09:45:59 -0500 (Tue, 24 Jan 2012) | 1 line
    
    CAMEL-4936: camel-test-blueprint now supports @EndpointInject in the end users unit test
class, like camel-test does. Use junit4 version as base for CamelTestSupport.
  ........
    r1235316 | davsclaus | 2012-01-24 10:55:31 -0500 (Tue, 24 Jan 2012) | 1 line
    
    CAMEL-4932: camel-twitter improvements. Applied patch from Bilgin.
  ........
    r1235456 | bvahdat | 2012-01-24 15:02:51 -0500 (Tue, 24 Jan 2012) | 1 line
    
    Specify the maven (UTF-8) encoding stuff on the top level POM
  ........
    r1235458 | bvahdat | 2012-01-24 15:07:25 -0500 (Tue, 24 Jan 2012) | 1 line
    
    CAMEL-4937: Specified the encoding to be UTF-8 by the Camel maven archetypes so that maven
doesn't WARN about platform dependent encoding, also polished all the POMs
  ........
................

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

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



Mime
View raw message