Permalink
Switch branches/tags
Commits on Oct 13, 2011
  1. [maven-release-plugin] copy for tag camel-2.7.4

    git-svn-id: https://svn.apache.org/repos/asf/camel/tags/camel-2.7.4@1183010 13f79535-47bb-0310-9956-ffa450edef68
    dkulp committed Oct 13, 2011
  2. Message won't have a security reason in it

    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1182859 13f79535-47bb-0310-9956-ffa450edef68
    dkulp committed Oct 13, 2011
  3. Update to 2.3.7 version of CXF. Required backporting of:

    Merged revisions 1170965,1171400 via svnmerge from 
    https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
    
    ................
      r1170965 | ningjiang | 2011-09-15 02:11:30 -0400 (Thu, 15 Sep 2011) | 9 lines
      
      Merged revisions 1170956 via svnmerge from 
      https://svn.apache.org/repos/asf/camel/trunk
      
      ........
        r1170956 | ningjiang | 2011-09-15 13:04:16 +0800 (Thu, 15 Sep 2011) | 1 line
        
        CAMEL-4429 Applied patch with thanks to  Aki
      ........
    ................
      r1171400 | ningjiang | 2011-09-16 02:30:13 -0400 (Fri, 16 Sep 2011) | 9 lines
      
      Merged revisions 1171396 via svnmerge from 
      https://svn.apache.org/repos/asf/camel/trunk
      
      ........
        r1171396 | ningjiang | 2011-09-16 14:19:22 +0800 (Fri, 16 Sep 2011) | 1 line
        
        CAMEL-4452 avoid the NPE error when there oneway operation for the PayLoad invocation on CxfConsumer
      ........
    ................
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1182848 13f79535-47bb-0310-9956-ffa450edef68
    dkulp committed Oct 13, 2011
Commits on Oct 12, 2011
  1. [maven-release-plugin] copy for tag camel-2.7.4

    git-svn-id: https://svn.apache.org/repos/asf/camel/tags/camel-2.7.4@1182488 13f79535-47bb-0310-9956-ffa450edef68
    dkulp committed Oct 12, 2011
Commits on Oct 11, 2011
  1. Fixed compilation of camel-printer

    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1181780 13f79535-47bb-0310-9956-ffa450edef68
    davsclaus committed Oct 11, 2011
Commits on Oct 10, 2011
  1. CAMEL-4523: Upgrade to EasyMock 3.0

    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1181254 13f79535-47bb-0310-9956-ffa450edef68
    Christian Mueller committed Oct 10, 2011
  2. fixed merge failure from privious commit

    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1180787 13f79535-47bb-0310-9956-ffa450edef68
    Christian Mueller committed Oct 10, 2011
Commits on Oct 9, 2011
  1. CAMEL-4524: Upgrade jsmpp-bundle to version 2.1.0_3

    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1180711 13f79535-47bb-0310-9956-ffa450edef68
    Christian Mueller committed Oct 9, 2011
  2. CAMEL-4530: When useMessageIDAsCorrelationID an timeout occurs due no…

    … reply message, then old correlationID is not evicted from dynamic reply selector
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1180600 13f79535-47bb-0310-9956-ffa450edef68
    davsclaus committed Oct 9, 2011
Commits on Oct 2, 2011
Commits on Oct 1, 2011
Commits on Sep 29, 2011
  1. Merged revisions 1177397 via svnmerge from

    https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
    
    ................
      r1177397 | dvaleri | 2011-09-29 14:54:27 -0400 (Thu, 29 Sep 2011) | 8 lines
      
      Merged revisions 1177394 via svnmerge from 
      https://svn.apache.org/repos/asf/camel/trunk
      
      ........
        r1177394 | dvaleri | 2011-09-29 14:42:53 -0400 (Thu, 29 Sep 2011) | 1 line
        
        [CAMEL-4504] Added unit test to cover bean expressions that throw excetpions fix from 2.4.0.
      ........
    ................
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1177403 13f79535-47bb-0310-9956-ffa450edef68
    DavidValeri committed Sep 29, 2011
Commits on Sep 28, 2011
  1. Merged revisions 1176787 via svnmerge from

    https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
    
    ................
      r1176787 | ningjiang | 2011-09-28 16:58:44 +0800 (Wed, 28 Sep 2011) | 13 lines
      
      Merged revisions 1176781-1176782 via svnmerge from 
      https://svn.apache.org/repos/asf/camel/trunk
      
      ........
        r1176781 | ningjiang | 2011-09-28 16:23:35 +0800 (Wed, 28 Sep 2011) | 1 line
        
        CAMEL-4497 HttpPollingConsumer Get URL should support the property place holders as HttpProducer does
      ........
        r1176782 | ningjiang | 2011-09-28 16:27:15 +0800 (Wed, 28 Sep 2011) | 1 line
        
        CAMEL-4489, CAMEL-4497 fixed the camel-http4 proxy url issue
      ........
    ................
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1176792 13f79535-47bb-0310-9956-ffa450edef68
    WillemJiang committed Sep 28, 2011
Commits on Sep 27, 2011
  1. Merged revisions 1176329 via svnmerge from

    https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
    
    ................
      r1176329 | ningjiang | 2011-09-27 19:17:54 +0800 (Tue, 27 Sep 2011) | 9 lines
      
      Merged revisions 1176274 via svnmerge from 
      https://svn.apache.org/repos/asf/camel/trunk
      
      ........
        r1176274 | ningjiang | 2011-09-27 16:32:54 +0800 (Tue, 27 Sep 2011) | 1 line
        
        CAMEL-4489 Fixed the http4 url issue when using the proxy
      ........
    ................
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1176341 13f79535-47bb-0310-9956-ffa450edef68
    WillemJiang committed Sep 27, 2011
Commits on Sep 26, 2011
  1. Merged revisions 1175323 via svnmerge from

    https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
    
    ........
      r1175323 | davsclaus | 2011-09-25 16:09:48 +0800 (Sun, 25 Sep 2011) | 4 lines
      
      Merged revisions 1175321 via svnmerge from 
      https://svn.apache.org/repos/asf/camel/trunk
    ........
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1175645 13f79535-47bb-0310-9956-ffa450edef68
    WillemJiang committed Sep 26, 2011
Commits on Sep 23, 2011
  1. Blocked revisions 1146782,1146943,1146964,1146993,1147117 via svnmerge

    ........
      r1146782 | davsclaus | 2011-07-14 18:37:50 +0200 (Thu, 14 Jul 2011) | 1 line
      
      CAMEL-4212: Add support for multi value headers for the http related components.
    ........
      r1146943 | ningjiang | 2011-07-15 04:59:40 +0200 (Fri, 15 Jul 2011) | 1 line
      
      CAMEL-4229 Added the wrap methods for template, consumer and context in org.apache.camel.test.junit4.CamelContextSupport
    ........
      r1146964 | davsclaus | 2011-07-15 07:49:32 +0200 (Fri, 15 Jul 2011) | 1 line
      
      Added unit test based on user forum issue
    ........
      r1146993 | ningjiang | 2011-07-15 09:39:57 +0200 (Fri, 15 Jul 2011) | 1 line
      
      CAMEL-4229 Fixed the same issue of camel-testng
    ........
      r1147117 | ningjiang | 2011-07-15 14:26:10 +0200 (Fri, 15 Jul 2011) | 1 line
      
      CAMEL-4235 fixed the unit test error of CamelBlueprint2Test.testErrorHandler()
    ........
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1174700 13f79535-47bb-0310-9956-ffa450edef68
    davsclaus committed Sep 23, 2011
  2. Added missing import of java.util.Map

    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1174698 13f79535-47bb-0310-9956-ffa450edef68
    davsclaus committed Sep 23, 2011
  3. Blocked some merges

    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1174685 13f79535-47bb-0310-9956-ffa450edef68
    davsclaus committed Sep 23, 2011
Commits on Sep 22, 2011
  1. Manually merged revision 1124595 from trunk.

    CAMEL-3962: java.io.File -> InputStream converter should favor using FileInputStream instead of loading content into memory.
    
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1174119 13f79535-47bb-0310-9956-ffa450edef68
    janstey committed Sep 22, 2011
Commits on Aug 8, 2011
  1. Blocked revisions 1146158,1146161,1146553,1148009,1148047,1148050,114…

    …8053,1148090-1148091,1151941,1152125,1154082,1154086,1154954 via svnmerge
    
    ........
      r1146158 | hadrian | 2011-07-13 13:47:59 -0400 (Wed, 13 Jul 2011) | 1 line
      
      [maven-release-plugin] prepare release camel-2.8.0
    ........
      r1146161 | hadrian | 2011-07-13 13:50:05 -0400 (Wed, 13 Jul 2011) | 1 line
      
      [maven-release-plugin] prepare for next development iteration
    ........
      r1146553 | davsclaus | 2011-07-14 00:39:52 -0400 (Thu, 14 Jul 2011) | 1 line
      
      Upgraded version in etc/pom.xml
    ........
      r1148009 | hadrian | 2011-07-18 15:14:27 -0400 (Mon, 18 Jul 2011) | 1 line
      
      Revert version and redo 2.8.0 release
    ........
      r1148047 | hadrian | 2011-07-18 16:52:24 -0400 (Mon, 18 Jul 2011) | 1 line
      
      [maven-release-plugin] prepare release camel-2.8.0
    ........
      r1148050 | hadrian | 2011-07-18 16:55:28 -0400 (Mon, 18 Jul 2011) | 1 line
      
      [maven-release-plugin] prepare for next development iteration
    ........
      r1148053 | hadrian | 2011-07-18 17:20:13 -0400 (Mon, 18 Jul 2011) | 1 line
      
      Revert version and redo 2.8.0 release (need to remove tag and redo)
    ........
      r1148090 | hadrian | 2011-07-18 19:13:34 -0400 (Mon, 18 Jul 2011) | 1 line
      
      [maven-release-plugin] prepare release camel-2.8.0
    ........
      r1148091 | hadrian | 2011-07-18 19:13:58 -0400 (Mon, 18 Jul 2011) | 1 line
      
      [maven-release-plugin]  copy for tag camel-2.8.0
    ........
      r1151941 | hadrian | 2011-07-28 13:52:21 -0400 (Thu, 28 Jul 2011) | 1 line
      
      Creating camel-2.8.x fixes branch
    ........
      r1152125 | jbonofre | 2011-07-29 02:55:25 -0400 (Fri, 29 Jul 2011) | 1 line
      
      Fix the version on the 2.8.x branch.
    ........
      r1154082 | ningjiang | 2011-08-04 23:31:24 -0400 (Thu, 04 Aug 2011) | 3 lines
      
      Initialized merge tracking via "svnmerge" with revisions "1-1151940" from 
      https://svn.apache.org/repos/asf/camel/tags/camel-2.8.0
    ........
      r1154086 | ningjiang | 2011-08-04 23:51:47 -0400 (Thu, 04 Aug 2011) | 3 lines
      
      Initialized merge tracking via "svnmerge" with revisions "1-1151940" from 
      https://svn.apache.org/repos/asf/camel/trunk
    ........
      r1154954 | ningjiang | 2011-08-08 09:19:27 -0400 (Mon, 08 Aug 2011) | 1 line
      
      Fixed the camel-2.8.x svn merge properties
    ........
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1155023 13f79535-47bb-0310-9956-ffa450edef68
    dkulp committed Aug 8, 2011
  2. Merged revisions 1146771 via svnmerge from

    https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
    
    ........
      r1146771 | davsclaus | 2011-07-14 11:59:36 -0400 (Thu, 14 Jul 2011) | 1 line
      
      Avoid potential NPE in createIterator if delimier is null
    ........
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1155018 13f79535-47bb-0310-9956-ffa450edef68
    dkulp committed Aug 8, 2011
  3. Merged revisions 1146653 via svnmerge from

    https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
    
    ........
      r1146653 | janstey | 2011-07-14 07:17:38 -0400 (Thu, 14 Jul 2011) | 1 line
      
      update copyright date
    ........
    
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1155017 13f79535-47bb-0310-9956-ffa450edef68
    dkulp committed Aug 8, 2011
  4. Change svnmerge property to pull from 2.8.x branch, also update to on…

    …ly start from changes since 2.7.3 release.
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1155011 13f79535-47bb-0310-9956-ffa450edef68
    dkulp committed Aug 8, 2011
Commits on Jul 29, 2011
  1. [CAMEL-4276] Align CXF OSGi version range with the one defined in the…

    … Karaf features descriptor.
    
    git-svn-id: https://svn.apache.org/repos/asf/camel/branches/camel-2.7.x@1152136 13f79535-47bb-0310-9956-ffa450edef68
    jbonofre committed Jul 29, 2011
Commits on Jul 13, 2011