You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/06/04 16:47:51 UTC
[2/3] git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ef115ec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ef115ec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ef115ec
Branch: refs/heads/master
Commit: 7ef115ec1566445b33a279ca11dbec2980f320a9
Parents: 7c5d470
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 4 16:47:10 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 4 16:47:10 2013 +0200
----------------------------------------------------------------------
.../component/netty/http/NettyHttpComponent.java | 2 --
.../component/netty/http/NettyHttpSSLTest.java | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7ef115ec/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index b423201..eb8a56d 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -39,8 +39,6 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
// TODO: producer
// - add support for HTTP_URI / HTTP_QUERY overrides
// - add actual url to state so we know exactly which url we called also for done callback
- // - add support for connection timeout
- // - add support for request timeout
private NettyHttpBinding nettyHttpBinding;
private HeaderFilterStrategy headerFilterStrategy;
http://git-wip-us.apache.org/repos/asf/camel/blob/7ef115ec/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
index e10a737..62fbf54 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
@@ -79,7 +79,7 @@ public class NettyHttpSSLTest extends BaseNettyTest {
context.addRoutes(new RouteBuilder() {
public void configure() {
- from("netty-http:http://localhost:{{port}}?ssl=true&passphrase=changeit&keyStoreResource=jsse/localhost.ks&trustStoreResource=jsse/localhost.ks")
+ from("netty-http:https://localhost:{{port}}?ssl=true&passphrase=changeit&keyStoreResource=jsse/localhost.ks&trustStoreResource=jsse/localhost.ks")
.to("mock:input")
.transform().constant("Bye World");
}