/[Apache-SVN]
ViewVC logotype

Revision 1234669


Jump to revision: Previous Next
Author: hadrian
Date: Mon Jan 23 02:12:38 2012 UTC (12 years, 3 months ago)
Changed paths: 1
Log Message:
Blocked revisions 1234116-1234117,1234126,1234137,1234141,1234151-1234152,1234156,1234160,1234163-1234165,1234173-1234175,1234181,1234183-1234184,1234188,1234232-1234233 via svnmerge

................
  r1234116 | hadrian | 2012-01-20 15:33:06 -0500 (Fri, 20 Jan 2012) | 13 lines
  
  Recorded merge of revisions 1227310-1227433 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1227310 | cmueller | 2012-01-04 15:38:34 -0500 (Wed, 04 Jan 2012) | 1 line
    
    CAMEL-4862: Support relative time format in Camel SMPP by setting the validity periode
  ........
    r1227433 | hadrian | 2012-01-04 20:56:06 -0500 (Wed, 04 Jan 2012) | 1 line
    
    CAMEL-3774. Patch applied with thanks to Babak.
  ........
................
  r1234117 | hadrian | 2012-01-20 15:33:26 -0500 (Fri, 20 Jan 2012) | 12 lines
  
  Blocked revisions 1227474,1227498 via svnmerge
  
  ........
    r1227474 | hadrian | 2012-01-04 23:00:48 -0500 (Wed, 04 Jan 2012) | 1 line
    
    Checkstyle fix
  ........
    r1227498 | davsclaus | 2012-01-05 01:06:18 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4799: Rename traceNamespaces to logNamespaces. Thanks to Raul for the patch.
  ........
................
  r1234126 | hadrian | 2012-01-20 15:47:08 -0500 (Fri, 20 Jan 2012) | 9 lines
  
  Merged revisions 1227502 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1227502 | davsclaus | 2012-01-05 01:37:50 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4796: Applied constructor patch. Thanks to Babak for the patch.
  ........
................
  r1234137 | hadrian | 2012-01-20 16:06:05 -0500 (Fri, 20 Jan 2012) | 9 lines
  
  Merged revisions 1227595 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1227595 | davsclaus | 2012-01-05 08:56:00 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4796: Applied the remove NON-NLS patch. Thanks to Babak.
  ........
................
  r1234141 | hadrian | 2012-01-20 16:13:21 -0500 (Fri, 20 Jan 2012) | 64 lines
  
  Blocked revisions 1227529,1227532,1227546,1227550,1227658,1227929,1227983,1227999,1228060,1228067,1228073,1228088,1228092,1228138,1228171 via svnmerge
  
  ........
    r1227529 | davsclaus | 2012-01-05 04:00:27 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4809: Fixed interceptSendToEndpoint with when predicate and skip option enabled, should only skip sending if the predicate was true. Thanks to Raul for part of this work.
  ........
    r1227532 | davsclaus | 2012-01-05 04:42:54 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4809: Added more tests.
  ........
    r1227546 | ningjiang | 2012-01-05 05:34:25 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4017 Added camel-twitter component into trunk
  ........
    r1227550 | ningjiang | 2012-01-05 05:47:56 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4017 clean up the code and added camel-twitter into the kit
  ........
    r1227658 | davsclaus | 2012-01-05 11:01:28 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4796: Removed not needed type casts. Thanks to Babak for the patch.
  ........
    r1227929 | ningjiang | 2012-01-05 20:41:05 -0500 (Thu, 05 Jan 2012) | 1 line
    
    CAMEL-4017 update svn:ignore property
  ........
    r1227983 | davsclaus | 2012-01-06 01:41:59 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4779: Move ant path matching to camel-core. Work in pgoress. Moved some files.
  ........
    r1227999 | davsclaus | 2012-01-06 02:25:27 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4017: Polished
  ........
    r1228060 | cmoulliard | 2012-01-06 05:24:34 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4498 : Add new camel component for websockets
  ........
    r1228067 | cmoulliard | 2012-01-06 05:41:34 -0500 (Fri, 06 Jan 2012) | 1 line
    
    Checkstyle
  ........
    r1228073 | cmoulliard | 2012-01-06 05:44:37 -0500 (Fri, 06 Jan 2012) | 1 line
    
    Add websocket module to the list
  ........
    r1228088 | cmoulliard | 2012-01-06 06:16:24 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4498: Add camel-websocket in features xml file
  ........
    r1228092 | cmoulliard | 2012-01-06 06:19:25 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4498: Add camel-websocket to the distro file
  ........
    r1228138 | cmoulliard | 2012-01-06 07:10:47 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4498: Add karaf integration test
  ........
    r1228171 | ningjiang | 2012-01-06 08:37:44 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4867 add camel-twitter feature
  ........
................
  r1234151 | hadrian | 2012-01-20 16:37:42 -0500 (Fri, 20 Jan 2012) | 21 lines
  
  Recorded merge of revisions 1228329-1228668,1228670-1228683,1228685-1228755,1228757-1228824,1228826-1228878,1228880-1228891,1228893-1228956 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1228329 | cmueller | 2012-01-06 13:26:53 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4734: Consolidate the database vendors in our unit tests
  ........
    r1228495 | cmueller | 2012-01-06 18:08:03 -0500 (Fri, 06 Jan 2012) | 1 line
    
    CAMEL-4845: fix the issues reported by 'mvn -e apache-rat:check'
  ........
    r1228603 | cmueller | 2012-01-07 07:25:49 -0500 (Sat, 07 Jan 2012) | 1 line
    
    CAMEL-4870: Attachments is not propagated in the template components such as camel-stringtemplate
  ........
    r1228956 | cmueller | 2012-01-08 16:11:31 -0500 (Sun, 08 Jan 2012) | 1 line
    
    CAMEL-4152: jdbc idempotent repository - table creation
  ........
................
  r1234152 | hadrian | 2012-01-20 16:38:17 -0500 (Fri, 20 Jan 2012) | 40 lines
  
  Blocked revisions 1228669,1228684,1228756,1228825,1228892,1229147,1229149,1229457,1229472 via svnmerge
  
  ........
    r1228669 | cmueller | 2012-01-07 12:08:37 -0500 (Sat, 07 Jan 2012) | 1 line
    
    added .classpath, .project and .settings to svn:ignore
  ........
    r1228684 | cmueller | 2012-01-07 12:57:57 -0500 (Sat, 07 Jan 2012) | 1 line
    
    added target folder to svn:ignore
  ........
    r1228756 | cmueller | 2012-01-07 18:07:00 -0500 (Sat, 07 Jan 2012) | 1 line
    
    fixed failed unit test
  ........
    r1228825 | cmueller | 2012-01-08 06:09:23 -0500 (Sun, 08 Jan 2012) | 1 line
    
    fixed broken unit test
  ........
    r1228892 | davsclaus | 2012-01-08 11:52:24 -0500 (Sun, 08 Jan 2012) | 1 line
    
    CAMEL-4779: Applied 2nd patch. Thanks to Daniel. Added antInclude and antExclude options to file component to make using Ant path styles easier.
  ........
    r1229147 | davsclaus | 2012-01-09 08:46:58 -0500 (Mon, 09 Jan 2012) | 1 line
    
    CAMEL-4779: Added missing tests from patch.
  ........
    r1229149 | davsclaus | 2012-01-09 08:47:44 -0500 (Mon, 09 Jan 2012) | 1 line
    
    CAMEL-4498: Added camel-websocket to distribution
  ........
    r1229457 | ningjiang | 2012-01-09 21:51:50 -0500 (Mon, 09 Jan 2012) | 1 line
    
    CAMEL-4873 Twitter4J response objects as Exchange body
  ........
    r1229472 | ningjiang | 2012-01-10 00:37:59 -0500 (Tue, 10 Jan 2012) | 1 line
    
    CAMEL-4873 fix the CS errors of  camel-twitter
  ........
................
  r1234156 | hadrian | 2012-01-20 16:43:26 -0500 (Fri, 20 Jan 2012) | 10 lines
  
  Merged revisions 1229569 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1229569 | dkulp | 2012-01-10 09:56:14 -0500 (Tue, 10 Jan 2012) | 2 lines
    
    Update cxf version range to include the 2.6.0-SNAPSHOT that is the
    current CXF trunk
  ........
................
  r1234160 | hadrian | 2012-01-20 16:46:22 -0500 (Fri, 20 Jan 2012) | 9 lines
  
  Merged revisions 1229571 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1229571 | dkulp | 2012-01-10 09:56:31 -0500 (Tue, 10 Jan 2012) | 1 line
    
    Fix compiler warnings in camel-cxf-transport
  ........
................
  r1234163 | hadrian | 2012-01-20 16:51:15 -0500 (Fri, 20 Jan 2012) | 10 lines
  
  Merged revisions 1229572 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1229572 | dkulp | 2012-01-10 09:56:53 -0500 (Tue, 10 Jan 2012) | 2 lines
    
    Fix warnings in camel-cxf, update to work with both 2.5.x and
    2.6.0-SNAPSHOT
  ........
................
  r1234164 | hadrian | 2012-01-20 16:57:14 -0500 (Fri, 20 Jan 2012) | 9 lines
  
  Merged revisions 1230389 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1230389 | iocanel | 2012-01-11 22:49:59 -0500 (Wed, 11 Jan 2012) | 1 line
    
    [CAMEL-4889] KratiProducer now accepts non-string keys. Added a unit test to test producer with non-string keys.
  ........
................
  r1234165 | hadrian | 2012-01-20 17:00:27 -0500 (Fri, 20 Jan 2012) | 9 lines
  
  Merged revisions 1230601 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1230601 | hadrian | 2012-01-12 10:43:33 -0500 (Thu, 12 Jan 2012) | 1 line
    
    Test for BeanParameterValue with no body
  ........
................
  r1234173 | hadrian | 2012-01-20 17:05:11 -0500 (Fri, 20 Jan 2012) | 9 lines
  
  Merged revisions 1231101 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1231101 | iocanel | 2012-01-13 09:48:53 -0500 (Fri, 13 Jan 2012) | 1 line
    
    [CAMEL-4889] Checkstyle fixes
  ........
................
  r1234174 | hadrian | 2012-01-20 17:05:48 -0500 (Fri, 20 Jan 2012) | 21 lines
  
  Recorded merge of revisions 1229845-1230320,1230322-1230345,1230347-1230388,1230390-1230533,1230535-1230571 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1229845 | hadrian | 2012-01-10 20:18:50 -0500 (Tue, 10 Jan 2012) | 1 line
    
    CAMEL-4882. Remove timed out Exchanges from seda queue
  ........
    r1230261 | hadrian | 2012-01-11 16:34:14 -0500 (Wed, 11 Jan 2012) | 1 line
    
    CAMEL-4883. Upgrade maven-scala-plugin. Thanks Babak for patch
  ........
    r1230430 | cmueller | 2012-01-12 02:43:15 -0500 (Thu, 12 Jan 2012) | 1 line
    
    CAMEL-4885: Upgrade org.springframework 3.0.6.RELEASE -> 3.0.7.RELEASE
  ........
    r1230571 | hadrian | 2012-01-12 09:51:48 -0500 (Thu, 12 Jan 2012) | 1 line
    
    CAMEL-4890. Dynamic ports for camel-solr. Thanks Babak for patch
  ........
................
  r1234175 | hadrian | 2012-01-20 17:06:36 -0500 (Fri, 20 Jan 2012) | 43 lines
  
  Blocked revisions 1229570,1230321,1230346,1230534,1230684,1230691,1230710,1230837,1230883 via svnmerge
  
  ........
    r1229570 | dkulp | 2012-01-10 09:56:22 -0500 (Tue, 10 Jan 2012) | 1 line
    
    Fix a checkstyle issue
  ........
    r1230321 | cmueller | 2012-01-11 18:19:34 -0500 (Wed, 11 Jan 2012) | 1 line
    
    CAMEL-4767: Upgrade commons-codec:commons-codec:1.4 -> commons-codec:commons-codec:1.6
  ........
    r1230346 | gnodet | 2012-01-11 20:10:12 -0500 (Wed, 11 Jan 2012) | 1 line
    
    [CAMEL-4888] Test support classes for running junit tests with camel and blueprint
  ........
    r1230534 | hadrian | 2012-01-12 08:42:55 -0500 (Thu, 12 Jan 2012) | 1 line
    
    Fix build failure due to dependency on unavailable snapshot
  ........
    r1230684 | hadrian | 2012-01-12 13:25:36 -0500 (Thu, 12 Jan 2012) | 1 line
    
    CAMEL-4796. Patch applied with thanks to Babak
  ........
    r1230691 | hadrian | 2012-01-12 13:37:59 -0500 (Thu, 12 Jan 2012) | 1 line
    
    Ignore failing (hanging) test pending upgrade to pojosr 0.1.7
  ........
    r1230710 | dkulp | 2012-01-12 14:18:19 -0500 (Thu, 12 Jan 2012) | 4 lines
    
    Better search in a test so if the Bus itself configures in a new
    interceptor, test won't fail.
    Also add test dep into pom instead of grabbing transitively to make sure
    the requested version is picked up
  ........
    r1230837 | hadrian | 2012-01-12 18:25:41 -0500 (Thu, 12 Jan 2012) | 1 line
    
    Fix failing test
  ........
    r1230883 | hadrian | 2012-01-12 22:34:50 -0500 (Thu, 12 Jan 2012) | 1 line
    
    Fix build failure
  ........
................
  r1234181 | hadrian | 2012-01-20 17:16:17 -0500 (Fri, 20 Jan 2012) | 17 lines
  
  Recorded merge of revisions 1231440-1231532,1231534,1231536-1231598,1231600-1231644,1231646-1231703,1231705-1231766 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1231440 | hadrian | 2012-01-13 23:47:52 -0500 (Fri, 13 Jan 2012) | 1 line
    
    CAMEL-4894. Unit test demonstrating the problem
  ........
    r1231589 | cmueller | 2012-01-14 17:17:42 -0500 (Sat, 14 Jan 2012) | 1 line
    
    CAMEL-4884: Make velocity logging configurable
  ........
    r1231766 | cmueller | 2012-01-15 16:54:48 -0500 (Sun, 15 Jan 2012) | 1 line
    
    Add the release version number to the spring.schemas files
  ........
................
  r1234183 | hadrian | 2012-01-20 17:16:50 -0500 (Fri, 20 Jan 2012) | 36 lines
  
  Blocked revisions 1231142,1231206,1231330,1231420,1231533,1231535,1231599,1231645 via svnmerge
  
  ........
    r1231142 | davsclaus | 2012-01-13 11:01:40 -0500 (Fri, 13 Jan 2012) | 1 line
    
    CAMEL-4849: Added option to ignore missing property location. Thanks to Bilgin for the patch.
  ........
    r1231206 | cmueller | 2012-01-13 12:47:30 -0500 (Fri, 13 Jan 2012) | 1 line
    
    CAMEL-4886: Upgrade Spring Security 3.0.7.RELEASE -> 3.1.0.RELEASE
  ........
    r1231330 | cmueller | 2012-01-13 17:01:28 -0500 (Fri, 13 Jan 2012) | 1 line
    
    CAMEL-4887: Upgrade Spring Integration 2.0.5.RELEASE -> 2.1.0.RELEASE
  ........
    r1231420 | hadrian | 2012-01-13 19:13:10 -0500 (Fri, 13 Jan 2012) | 1 line
    
    CAMEL-4796. Patch applied with thanks to Babak
  ........
    r1231533 | davsclaus | 2012-01-14 12:25:26 -0500 (Sat, 14 Jan 2012) | 1 line
    
    CAMEL-4577: Added a ScheduledBatchPollingConsumer to reuse logic. Thanks to Bilgin for the patch.
  ........
    r1231535 | cmueller | 2012-01-14 12:31:24 -0500 (Sat, 14 Jan 2012) | 1 line
    
    CAMEL-4896: validation of camel-websocket feature failed
  ........
    r1231599 | cmueller | 2012-01-14 17:42:52 -0500 (Sat, 14 Jan 2012) | 1 line
    
    fixed my comment committed in CAMEL-4896
  ........
    r1231645 | davsclaus | 2012-01-15 05:38:40 -0500 (Sun, 15 Jan 2012) | 1 line
    
    CAMEL-4796: Applied rawtypes-3 patch. Thanks to Babak.
  ........
................
  r1234184 | hadrian | 2012-01-20 17:19:30 -0500 (Fri, 20 Jan 2012) | 9 lines
  
  Merged revisions 1232310 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1232310 | davsclaus | 2012-01-17 00:40:09 -0500 (Tue, 17 Jan 2012) | 1 line
    
    Polished javadoc
  ........
................
  r1234188 | hadrian | 2012-01-20 17:23:31 -0500 (Fri, 20 Jan 2012) | 9 lines
  
  Merged revisions 1232319 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1232319 | davsclaus | 2012-01-17 01:29:57 -0500 (Tue, 17 Jan 2012) | 1 line
    
    CAMEL-4905: Fixed typos in tests. Thanks to Bilgin for the patch.
  ........
................
  r1234232 | hadrian | 2012-01-20 21:09:14 -0500 (Fri, 20 Jan 2012) | 13 lines
  
  Recorded merge of revisions 1232304-1232305 via svnmerge from 
  https://svn.apache.org/repos/asf/camel/trunk
  
  ........
    r1232304 | hadrian | 2012-01-16 23:59:41 -0500 (Mon, 16 Jan 2012) | 1 line
    
    CAMEL-4603. Add attachments expression returning just attachment values to be used with splitter
  ........
    r1232305 | hadrian | 2012-01-16 23:59:51 -0500 (Mon, 16 Jan 2012) | 1 line
    
    CAMEL-4603. Do not propagate attachments on split messages.
  ........
................
  r1234233 | hadrian | 2012-01-20 21:09:53 -0500 (Fri, 20 Jan 2012) | 52 lines
  
  Blocked revisions 1232013,1232060,1232330,1232332,1232365,1232367,1232434,1232710,1232712,1232746-1232748 via svnmerge
  
  ........
    r1232013 | davsclaus | 2012-01-16 09:56:28 -0500 (Mon, 16 Jan 2012) | 1 line
    
    CAMEL-4093: Changed thread name pattern tokens to not clash with property placeholder tokens.
  ........
    r1232060 | gnodet | 2012-01-16 11:50:06 -0500 (Mon, 16 Jan 2012) | 1 line
    
    Switch to new released version of pojosr to fix the failing tests related to CAMEL-4888
  ........
    r1232330 | davsclaus | 2012-01-17 03:16:26 -0500 (Tue, 17 Jan 2012) | 1 line
    
    Added svn ignore
  ........
    r1232332 | davsclaus | 2012-01-17 03:29:13 -0500 (Tue, 17 Jan 2012) | 1 line
    
    camel-test-blueprint must use pertest fork mode for testing as otherwise it fails when having multiple test classes
  ........
    r1232365 | davsclaus | 2012-01-17 04:43:07 -0500 (Tue, 17 Jan 2012) | 1 line
    
    CAMEL-4906: Allow to easily configure JMX naming using managementNamePattern attribute on CamelContext.
  ........
    r1232367 | davsclaus | 2012-01-17 04:47:25 -0500 (Tue, 17 Jan 2012) | 1 line
    
    CAMEL-4906: Allow to easily configure JMX naming using managementNamePattern attribute on CamelContext.
  ........
    r1232434 | cmoulliard | 2012-01-17 10:09:09 -0500 (Tue, 17 Jan 2012) | 1 line
    
    CAMEL-3924: First input containing unit test with OpenWebbeans and CdiRegistry
  ........
    r1232710 | boday | 2012-01-17 20:26:08 -0500 (Tue, 17 Jan 2012) | 1 line
    
    CAMEL-4880, CAMEL-4881 added SolrInputDocument and streaming support
  ........
    r1232712 | boday | 2012-01-17 20:31:35 -0500 (Tue, 17 Jan 2012) | 1 line
    
    CAMEL-4880, CAMEL-4881 added SolrInputDocument and streaming support (removed unnecessary commits)
  ........
    r1232746 | ningjiang | 2012-01-18 00:06:33 -0500 (Wed, 18 Jan 2012) | 1 line
    
    CAMEL-4910 upgrade saxon version to 9.3.0.11
  ........
    r1232747 | ningjiang | 2012-01-18 00:08:55 -0500 (Wed, 18 Jan 2012) | 1 line
    
    CAMEL-4909 Correct camel-twitter unit test account tokens
  ........
    r1232748 | ningjiang | 2012-01-18 00:20:35 -0500 (Wed, 18 Jan 2012) | 1 line
    
    CAMEL-4910 upgrade saxon version of the karaf feature
  ........
................


Changed paths

Path Details
Directorycamel/branches/camel-2.8.x/ modified , props changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26