Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel into trunk-dev
Merge latest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8215230 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8215230 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8215230 Branch: refs/heads/master Commit: a8215230207fb5dd67104706529f8025d55a0613 Parents: 7c4a3fb 08a6f45 Author: Scott England-Sullivan <sully6...@apache.org> Authored: Sun Dec 1 20:58:48 2013 -0600 Committer: Scott England-Sullivan <sully6...@apache.org> Committed: Sun Dec 1 20:58:48 2013 -0600 ---------------------------------------------------------------------- .../java/org/apache/camel/CamelContext.java | 11 + .../apache/camel/impl/DefaultCamelContext.java | 10 + .../org/apache/camel/impl/DefaultConsumer.java | 2 +- .../camel/impl/DefaultUnitOfWorkFactory.java | 36 ++ .../camel/processor/CamelInternalProcessor.java | 2 +- .../org/apache/camel/spi/UnitOfWorkFactory.java | 31 ++ .../org/apache/camel/util/UnitOfWorkHelper.java | 12 +- .../camel/impl/CustomUnitOfWorkFactoryTest.java | 78 ++++ .../camel/component/avro/AvroListener.java | 418 +++++++++---------- .../component/avro/AvroReflectResponder.java | 72 ++-- .../component/avro/AvroSpecificResponder.java | 2 +- .../apache/camel/cdi/internal/BeanAdapter.java | 14 +- .../camel/cdi/internal/CamelContextBean.java | 11 +- .../camel/cdi/internal/CamelExtension.java | 14 +- .../xml/AbstractCamelContextFactoryBean.java | 6 + .../jackson/JacksonMarshalViewTest.java | 2 +- .../SpringJacksonJsonDataFormatTest.java | 2 +- .../camel/component/jms/JmsConstants.java | 1 + .../apache/camel/component/jms/JmsProducer.java | 14 +- .../camel/component/jms/reply/ReplyManager.java | 4 +- .../JmsInOutIndividualRequestTimeoutTest.java | 105 +++++ .../salesforce/api/dto/AbstractSObjectBase.java | 6 +- examples/camel-example-cafe/README.txt | 2 +- examples/camel-example-cafe/pom.xml | 221 +++++----- examples/camel-example-console/README.txt | 2 +- examples/camel-example-console/pom.xml | 13 +- parent/pom.xml | 20 +- .../src/main/resources/config.properties | 14 +- .../features/src/main/resources/features.xml | 17 +- .../camel/itest/karaf/AbstractFeatureTest.java | 1 + .../camel/itest/karaf/CamelDisruptorTest.java | 2 - .../apache/camel/itest/karaf/CamelDnsTest.java | 2 - .../camel/itest/karaf/CamelInfinispanTest.java | 2 - .../camel/itest/karaf/CamelJasyptTest.java | 2 - .../camel/itest/karaf/CamelOptaplannerTest.java | 2 - tooling/maven/camel-maven-plugin/pom.xml | 7 + .../java/org/apache/camel/maven/HawtioMojo.java | 58 +++ .../java/org/apache/camel/maven/RunMojo.java | 30 +- 38 files changed, 794 insertions(+), 454 deletions(-) ----------------------------------------------------------------------
