Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e8fdf3fd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e8fdf3fd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e8fdf3fd Branch: refs/heads/master Commit: e8fdf3fde824835004f1aab820281f4d7e96216c Parents: fee40c7 fb3537e Author: Henryk Konsek <hekon...@gmail.com> Authored: Wed Jun 5 12:09:36 2013 +0200 Committer: Henryk Konsek <hekon...@gmail.com> Committed: Wed Jun 5 12:09:36 2013 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/StreamCache.java | 2 +- .../mbean/ManagedBacklogDebuggerMBean.java | 5 +- .../org/apache/camel/builder/ValueBuilder.java | 10 ++ .../apache/camel/component/ResourceEndpoint.java | 4 +- .../apache/camel/component/bean/BeanEndpoint.java | 2 +- .../component/controlbus/ControlBusEndpoint.java | 5 + .../camel/component/dataset/DataSetEndpoint.java | 10 ++- .../component/direct/DirectBlockingProducer.java | 2 +- .../apache/camel/component/file/FileEndpoint.java | 5 +- .../camel/component/file/GenericFileEndpoint.java | 45 +++++++- .../camel/component/language/LanguageEndpoint.java | 5 + .../apache/camel/component/log/LogComponent.java | 6 +- .../apache/camel/component/log/LogEndpoint.java | 63 +++++++++- .../apache/camel/component/seda/SedaEndpoint.java | 14 ++- .../apache/camel/component/test/TestComponent.java | 11 ++- .../apache/camel/component/test/TestEndpoint.java | 10 ++ .../org/apache/camel/impl/DefaultEndpoint.java | 3 + .../management/mbean/ManagedBacklogDebugger.java | 4 + .../processor/interceptor/BacklogDebugger.java | 16 +++ .../component/log/LogEndpointOptionsTest.java | 46 +++++++ .../language/TokenXMLPairNamespaceSplitTest.java | 19 +++ .../camel/management/BacklogDebuggerTest.java | 96 +++++++++++++++ .../component/netty/http/NettyHttpComponent.java | 2 - .../component/netty/http/NettyHttpSSLTest.java | 2 +- .../netty/DefaultClientPipelineFactory.java | 11 ++ .../camel/component/netty/NettyConfiguration.java | 27 ++++ .../camel/component/netty/NettyConsumer.java | 1 + .../netty/NettyConsumerExceptionHandler.java | 66 ++++++++++ .../netty/handlers/ServerChannelHandler.java | 9 +- .../component/netty/NettyRequestTimeoutTest.java | 84 +++++++++++++ .../component/sap/netweaver/NetWeaverEndpoint.java | 7 + .../component/sap/netweaver/NetWeaverProducer.java | 6 +- components/camel-saxon/pom.xml | 11 +-- .../component/twitter/TwitterConfiguration.java | 32 ++++- parent/pom.xml | 6 +- 35 files changed, 595 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
