Author: hadrian
Date: Fri Feb 10 05:58:08 2012
New Revision: 1242689
URL: http://svn.apache.org/viewvc?rev=1242689&view=rev
Log:
Blocked revisions
1239532,1240737,1240976-1240977,1241000,1241058,1241065,1241110,1241143-1241144,1241188,1241450,1242079,1242241
via svnmerge
........
r1239532 | davsclaus | 2012-02-02 05:42:56 -0500 (Thu, 02 Feb 2012) | 1 line
CAMEL-4546: camel-web can now start using mvn tomcat7:run
........
r1240737 | davsclaus | 2012-02-05 09:04:10 -0500 (Sun, 05 Feb 2012) | 1 line
CAMEL-4951: Upgrade aws to 1.3.0. CAMEL-4923: Added new aws-ddb component.
Thanks to Bilgin for the patch.
........
r1240976 | cmoulliard | 2012-02-06 06:08:44 -0500 (Mon, 06 Feb 2012) | 1 line
Add BeanManagerProvider and services (javax.enterprise.inject.spi.extension)
........
r1240977 | cmoulliard | 2012-02-06 06:11:39 -0500 (Mon, 06 Feb 2012) | 1 line
remove non required class
........
r1241000 | davsclaus | 2012-02-06 07:47:08 -0500 (Mon, 06 Feb 2012) | 1 line
Added FAQ examples
........
r1241058 | bvahdat | 2012-02-06 11:16:35 -0500 (Mon, 06 Feb 2012) | 1 line
Added the missing <relativePath> entry by the camel-beanio POM.
........
r1241065 | hadrian | 2012-02-06 11:36:26 -0500 (Mon, 06 Feb 2012) | 1 line
Checkstyle fixes
........
r1241110 | hadrian | 2012-02-06 13:55:07 -0500 (Mon, 06 Feb 2012) | 1 line
Remove warnings and System.out calls
........
r1241143 | dvaleri | 2012-02-06 15:10:40 -0500 (Mon, 06 Feb 2012) | 1 line
[CAMEL-4987] Push of initial Spring Test integration code.
........
r1241144 | dvaleri | 2012-02-06 15:11:30 -0500 (Mon, 06 Feb 2012) | 1 line
[CAMEL-4987] Push of initial Spring Test integration code for TestNG.
........
r1241188 | bvahdat | 2012-02-06 16:30:46 -0500 (Mon, 06 Feb 2012) | 1 line
Fixed the test failure on the CI-Server
(org.apache.camel.model.ModelSanityCheckerTest), also by
BeanIODataFormatComplexTest take the fact into the account that the default
Locale could be something else other than Locale.ENGLISH.
........
r1241450 | dvaleri | 2012-02-07 07:49:03 -0500 (Tue, 07 Feb 2012) | 1 line
[CAMEL-4987] Reverting TestNG support until review of code is complete.
........
r1242079 | hadrian | 2012-02-08 15:33:03 -0500 (Wed, 08 Feb 2012) | 1 line
Polish. Update test dependencies for camel-solr
........
r1242241 | ningjiang | 2012-02-09 03:52:46 -0500 (Thu, 09 Feb 2012) | 1 line
Fixed the CS errors of camel-avro
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
