Author: dkulp Date: Mon Sep 19 22:51:59 2011 New Revision: 1172876 URL: http://svn.apache.org/viewvc?rev=1172876&view=rev Log: Blocked revisions 1161081,1161112,1161306,1161354,1161356,1161384,1161397,1161405,1161417,1161449,1161465,1161476,1161554,1161561,1161575,1161583,1161587,1161953,1162006,1162057,1162080 via svnmerge
........ r1161081 | cschneider | 2011-08-24 08:50:11 -0400 (Wed, 24 Aug 2011) | 1 line Move SynchronizationAdapter to support and add compatibility stub ........ r1161112 | jbonofre | 2011-08-24 10:23:47 -0400 (Wed, 24 Aug 2011) | 1 line [CAMEL-4373] Update to xstream 1.4.1 ........ r1161306 | hadrian | 2011-08-24 18:31:37 -0400 (Wed, 24 Aug 2011) | 1 line CAMEL-2472. Patch applied with thanks to Stephen Gargan ........ r1161354 | hadrian | 2011-08-24 21:29:34 -0400 (Wed, 24 Aug 2011) | 1 line CAMEL-2472. Fix test (dependency on ON order) ........ r1161356 | hadrian | 2011-08-24 21:32:59 -0400 (Wed, 24 Aug 2011) | 1 line CAMEL-2472. No need for forking pertest ........ r1161384 | davsclaus | 2011-08-25 01:07:15 -0400 (Thu, 25 Aug 2011) | 1 line Fixed CS. Polished javadoc. ........ r1161397 | davsclaus | 2011-08-25 01:52:24 -0400 (Thu, 25 Aug 2011) | 1 line CAMEL-2472: Polished. ........ r1161405 | davsclaus | 2011-08-25 02:31:16 -0400 (Thu, 25 Aug 2011) | 1 line CAMEL-2472: Added camel-zookeeper to kit ........ r1161417 | davsclaus | 2011-08-25 03:00:51 -0400 (Thu, 25 Aug 2011) | 1 line CAMEL-2472: Use slf4j for logging. Fixed the dependency in pom.xml. Generate JAR as osgi bundle. Dont use camel-core-test for unit testing. ........ r1161449 | cschneider | 2011-08-25 04:55:46 -0400 (Thu, 25 Aug 2011) | 1 line move createExceptionMessage from EchangeHelper to CamelExchangeException to avoid dependency from api to util ........ r1161465 | ffang | 2011-08-25 05:34:06 -0400 (Thu, 25 Aug 2011) | 1 line [CAMEL-4377]camel-zookeper - Add features.xml ........ r1161476 | cschneider | 2011-08-25 06:04:23 -0400 (Thu, 25 Aug 2011) | 1 line Move Ordered interface from util to api as it is needed in SynchronizationAdapter ........ r1161554 | cschneider | 2011-08-25 09:19:04 -0400 (Thu, 25 Aug 2011) | 1 line Move ModelHelper from util to model to avoid references from util to model ........ r1161561 | cschneider | 2011-08-25 09:30:37 -0400 (Thu, 25 Aug 2011) | 1 line Move BytesSource and StringSource from converter to api as they are used from several places including util which should not know about converters ........ r1161575 | cschneider | 2011-08-25 10:30:15 -0400 (Thu, 25 Aug 2011) | 1 line Fix for compile problem after move of StringSource ........ r1161583 | cschneider | 2011-08-25 10:40:34 -0400 (Thu, 25 Aug 2011) | 1 line Fix for compile problem after move of StringSource ........ r1161587 | cschneider | 2011-08-25 10:51:30 -0400 (Thu, 25 Aug 2011) | 1 line Fix for compile problem after move of StringSource ........ r1161953 | hadrian | 2011-08-25 21:07:17 -0400 (Thu, 25 Aug 2011) | 1 line CAMEL-4376. Deprecate and remove usage of wrong constructors for DefaultEndpoint in camel-core. ........ r1162006 | davsclaus | 2011-08-26 02:56:27 -0400 (Fri, 26 Aug 2011) | 1 line CAMEL-4384: Added test. ........ r1162057 | cschneider | 2011-08-26 06:35:07 -0400 (Fri, 26 Aug 2011) | 1 line Make createException delegate to CamelExchangeException and set method as deprecated ........ r1162080 | ningjiang | 2011-08-26 08:23:46 -0400 (Fri, 26 Aug 2011) | 1 line support to set the version of apache-camel feature in OSGi test support ........ Modified: camel/branches/camel-2.8.x/ (props changed) Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.