Author: dkulp
Date: Wed Jan 4 19:18:00 2012
New Revision: 1227271
URL: http://svn.apache.org/viewvc?rev=1227271&view=rev
Log:
Blocked revisions
1222462,1222482,1222577,1222582,1222779,1222946,1222982,1224673,1224683,1224715,1224725,1224727,1225028,1225048,1225050,1225132,1225135,1225165,1225168,1225170,1225206,1225208,1225458,1225490,1225578,1225687,1225768-1225769,1225776-1225777,1225780,1225817,1225819,1225863,1225916,1225926,1225946
via svnmerge
........
r1222462 | dkulp | 2011-12-22 16:26:22 -0500 (Thu, 22 Dec 2011) | 1 line
Fix some warnings in eclipse
........
r1222482 | dkulp | 2011-12-22 17:04:47 -0500 (Thu, 22 Dec 2011) | 1 line
Fix more warnings in eclipse
........
r1222577 | davsclaus | 2011-12-23 00:49:06 -0500 (Fri, 23 Dec 2011) | 1 line
OSGi tests should use the default karaf options from the base test class
........
r1222582 | davsclaus | 2011-12-23 01:11:18 -0500 (Fri, 23 Dec 2011) | 1 line
CAMEL-4822: Introduced AbstractJdbcMessageIdRepository to make it easier to
implement custom JDBC repo, to control the SQL being used. Thanks to Philip
Glebow for the patch.
........
r1222779 | iocanel | 2011-12-23 13:28:28 -0500 (Fri, 23 Dec 2011) | 1 line
[CAMEL-4827] Upgraded to jclouds 1.2.2.
........
r1222946 | davsclaus | 2011-12-24 04:35:45 -0500 (Sat, 24 Dec 2011) | 1 line
CAMEL-4823: Optimized log EIP to only evaluate if should log.
........
r1222982 | davsclaus | 2011-12-24 09:36:00 -0500 (Sat, 24 Dec 2011) | 1 line
CAMEL-4814: Use dynamic port numbers for testing examples.
........
r1224673 | ningjiang | 2011-12-25 22:49:42 -0500 (Sun, 25 Dec 2011) | 1 line
Added unit tests based on the mailing list question
........
r1224683 | jbonofre | 2011-12-26 01:51:55 -0500 (Mon, 26 Dec 2011) | 1 line
Revert xml-specs-api dependency in the features and let the user handle that
........
r1224715 | davsclaus | 2011-12-26 06:28:25 -0500 (Mon, 26 Dec 2011) | 1 line
CAMEL-4814: Use dynamic port numbers for testing examples.
........
r1224725 | davsclaus | 2011-12-26 07:16:31 -0500 (Mon, 26 Dec 2011) | 1 line
CAMEL-4814: Use dynamic port numbers for testing examples.
........
r1224727 | davsclaus | 2011-12-26 07:31:42 -0500 (Mon, 26 Dec 2011) | 1 line
Polished
........
r1225028 | hadrian | 2011-12-27 17:10:27 -0500 (Tue, 27 Dec 2011) | 1 line
Checkstyle fixes
........
r1225048 | hadrian | 2011-12-27 18:45:47 -0500 (Tue, 27 Dec 2011) | 1 line
[maven-release-plugin] prepare release camel-2.9.0
........
r1225050 | hadrian | 2011-12-27 18:47:15 -0500 (Tue, 27 Dec 2011) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r1225132 | ningjiang | 2011-12-28 02:39:08 -0500 (Wed, 28 Dec 2011) | 1 line
CAMEL-4836 upgraded smack to 3.2.1
........
r1225135 | ningjiang | 2011-12-28 02:50:02 -0500 (Wed, 28 Dec 2011) | 1 line
CAMEL-4836 fixed the pom.xml version issue
........
r1225165 | davsclaus | 2011-12-28 07:12:58 -0500 (Wed, 28 Dec 2011) | 1 line
CAMEL-4814: Use dynamic port numbers for testing examples. CAMEL-4830:
Improved and preparing loan broker example to be split into two.
........
r1225168 | davsclaus | 2011-12-28 07:30:58 -0500 (Wed, 28 Dec 2011) | 1 line
CAMEL-4814: Use dynamic port numbers for testing examples. CAMEL-4830:
Improved and preparing loan broker example to be split into two.
........
r1225170 | davsclaus | 2011-12-28 07:38:53 -0500 (Wed, 28 Dec 2011) | 1 line
Polished example
........
r1225206 | davsclaus | 2011-12-28 10:27:49 -0500 (Wed, 28 Dec 2011) | 1 line
4830: This is the walk through example, so we should keep it simple as in the
documentation.
........
r1225208 | davsclaus | 2011-12-28 10:33:16 -0500 (Wed, 28 Dec 2011) | 1 line
4830: This is the walk through example, so we should keep it simple as in the
documentation.
........
r1225458 | ningjiang | 2011-12-29 02:32:43 -0500 (Thu, 29 Dec 2011) | 1 line
CAMEL-4838 fix the typos of the camel-example-loadbalanceing README file with
thanks to Glen
........
r1225490 | davsclaus | 2011-12-29 05:43:18 -0500 (Thu, 29 Dec 2011) | 1 line
Use port finder from camel-test instead of custom code to find free port,
when testing camel-ftp.
........
r1225578 | davsclaus | 2011-12-29 10:55:30 -0500 (Thu, 29 Dec 2011) | 1 line
CAMEL-4814: Use dynamic ports for unit testing examples. Removed AOP part of
this example as its just confusing a bit more.
........
r1225687 | cmueller | 2011-12-29 18:10:55 -0500 (Thu, 29 Dec 2011) | 1 line
CAMEL-4152: jdbc idempotent repository - table creation
........
r1225768 | ningjiang | 2011-12-30 03:14:56 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4837 use dynamic port numbers with HttpAsync itest
........
r1225769 | ningjiang | 2011-12-30 03:16:56 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4837 use dynamic port number with ftp itest
........
r1225776 | ningjiang | 2011-12-30 04:10:20 -0500 (Fri, 30 Dec 2011) | 1 line
Clean up the configure code of spring-config
........
r1225777 | ningjiang | 2011-12-30 04:12:28 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4837 use dynamic port numbers with http itest
........
r1225780 | ningjiang | 2011-12-30 05:02:05 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4837 use dynamic port numbers with cxf greeter itests
........
r1225817 | davsclaus | 2011-12-30 07:47:15 -0500 (Fri, 30 Dec 2011) | 1 line
Polished javadoc
........
r1225819 | ningjiang | 2011-12-30 08:12:08 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4837 use dynamic port numbers with jetty itests
........
r1225863 | cschneider | 2011-12-30 12:03:57 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4843 Adding a test for the issue
........
r1225916 | cschneider | 2011-12-30 15:40:08 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4843 Fixed method name
........
r1225926 | cmueller | 2011-12-30 16:28:46 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4152: jdbc idempotent repository - table creation
........
r1225946 | cmueller | 2011-12-30 17:17:23 -0500 (Fri, 30 Dec 2011) | 1 line
CAMEL-4152: jdbc idempotent repository - table creation
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-blocked' - no diff available.
