CAMEL-6488: camel-netty-http. Weird osgi issue.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6e8ca922 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6e8ca922 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6e8ca922 Branch: refs/heads/master Commit: 6e8ca92263c5fbb6de73c2bbcb3e9ad6be1f0ae2 Parents: d553a92 Author: Claus Ibsen <[email protected]> Authored: Wed Jun 26 11:26:22 2013 +0200 Committer: Claus Ibsen <[email protected]> Committed: Wed Jun 26 11:26:22 2013 +0200 ---------------------------------------------------------------------- .../netty/http/DefaultNettySharedHttpServer.java | 4 ++-- .../netty/http/HttpServerSharedPipelineFactory.java | 14 +++++++------- .../component/netty/http/NettySharedHttpServer.java | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6e8ca922/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettySharedHttpServer.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettySharedHttpServer.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettySharedHttpServer.java index 0ef3c2a..034bb68 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettySharedHttpServer.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettySharedHttpServer.java @@ -34,12 +34,12 @@ public class DefaultNettySharedHttpServer extends ServiceSupport implements Nett private static final Logger LOG = LoggerFactory.getLogger(DefaultNettySharedHttpServer.class); - private NettySharedHttpServerBootstrapConfiguration configuration; + private NettyServerBootstrapConfiguration configuration; private HttpServerConsumerChannelFactory channelFactory; private HttpServerBootstrapFactory bootstrapFactory; private ClassResolver classResolver; - public void setNettyServerBootstrapConfiguration(NettySharedHttpServerBootstrapConfiguration configuration) { + public void setNettyServerBootstrapConfiguration(NettyServerBootstrapConfiguration configuration) { this.configuration = configuration; } http://git-wip-us.apache.org/repos/asf/camel/blob/6e8ca922/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java index 7200f8e..e4e88f9 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/HttpServerSharedPipelineFactory.java @@ -43,12 +43,12 @@ import org.slf4j.LoggerFactory; public class HttpServerSharedPipelineFactory extends HttpServerPipelineFactory { private static final Logger LOG = LoggerFactory.getLogger(HttpServerSharedPipelineFactory.class); - private final NettySharedHttpServerBootstrapConfiguration configuration; + private final NettyServerBootstrapConfiguration configuration; private final HttpServerConsumerChannelFactory channelFactory; private final ClassResolver classResolver; private SSLContext sslContext; - public HttpServerSharedPipelineFactory(NettySharedHttpServerBootstrapConfiguration configuration, HttpServerConsumerChannelFactory channelFactory, + public HttpServerSharedPipelineFactory(NettyServerBootstrapConfiguration configuration, HttpServerConsumerChannelFactory channelFactory, ClassResolver classResolver) { this.configuration = configuration; this.channelFactory = channelFactory; @@ -82,13 +82,13 @@ public class HttpServerSharedPipelineFactory extends HttpServerPipelineFactory { pipeline.addLast("decoder", new HttpRequestDecoder()); // Uncomment the following line if you don't want to handle HttpChunks. - if (configuration.isChunked()) { +// if (configuration.isChunked()) { pipeline.addLast("aggregator", new HttpChunkAggregator(1048576)); - } +// } pipeline.addLast("encoder", new HttpResponseEncoder()); - if (configuration.isCompression()) { - pipeline.addLast("deflater", new HttpContentCompressor()); - } +// if (configuration.isCompression()) { +// pipeline.addLast("deflater", new HttpContentCompressor()); +// } pipeline.addLast("handler", channelFactory.getChannelHandler()); http://git-wip-us.apache.org/repos/asf/camel/blob/6e8ca922/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServer.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServer.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServer.java index c29e553..b98f118 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServer.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettySharedHttpServer.java @@ -34,7 +34,7 @@ public interface NettySharedHttpServer extends Service { /** * Sets the bootstrap configuration to use by this shared Netty HTTP server. */ - void setNettyServerBootstrapConfiguration(NettySharedHttpServerBootstrapConfiguration configuration); + void setNettyServerBootstrapConfiguration(NettyServerBootstrapConfiguration configuration); /** * To use a custom {@link ClassResolver} for loading resource on the classpath.
