Repository: camel Updated Branches: refs/heads/temp-jetty9 82f99a64f -> 0e076c016
Avoid direct usage of impl class Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0e076c01 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0e076c01 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0e076c01 Branch: refs/heads/temp-jetty9 Commit: 0e076c0168bf3a647ad24967f8602505f2347702 Parents: 82f99a6 Author: Christian Schneider <ch...@die-schneider.net> Authored: Fri Dec 12 17:59:18 2014 +0100 Committer: Christian Schneider <ch...@die-schneider.net> Committed: Fri Dec 12 17:59:18 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/component/jetty/ExplicitHttpsRouteTest.java | 6 +----- .../jetty/ExplicitHttpsSslContextParametersRouteTest.java | 6 +----- .../apache/camel/component/jetty/ExplicitJettyRouteTest.java | 7 ------- .../jetty/HttpsRouteAddSslConnectorPropertiesTest.java | 3 +-- .../org/apache/camel/component/jetty/HttpsRouteAliasTest.java | 4 +--- .../jetty/HttpsRouteSslContextParametersInComponentTest.java | 6 +----- .../jetty/HttpsRouteSslContextParametersInUriTest.java | 3 +-- .../jetty/HttpsRouteWithSslConnectorPropertiesTest.java | 6 +----- .../component/jetty/JettyRouteWithSocketPropertiesTest.java | 7 ++----- .../jetty/JettyRouteWithUnknownSocketPropertiesTest.java | 6 +----- .../jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java | 6 +----- 11 files changed, 11 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java index 24c0922..e5f1e2a 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsRouteTest.java @@ -51,12 +51,8 @@ public class ExplicitHttpsRouteTest extends HttpsRouteTest { connectors.put(port1, createSslContextFactory(port1)); connectors.put(port2, createSslContextFactory(port2)); - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); - // add connectors + JettyHttpComponent jetty = getContext().getComponent("jetty", JettyHttpComponent.class); jetty.setSslSocketConnectors(connectors); - // add jetty to camel context - context.addComponent("jetty", jetty); // END SNIPPET: e1 from("jetty:https://localhost:"; + port1 + "/test").to("mock:a"); http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java index 36d86d0..2c0151f 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitHttpsSslContextParametersRouteTest.java @@ -59,12 +59,8 @@ public class ExplicitHttpsSslContextParametersRouteTest extends HttpsRouteTest { connectors.put(port1, createSslSocketConnector()); connectors.put(port2, createSslSocketConnector()); - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); - // add connectors + JettyHttpComponent jetty = getContext().getComponent("jetty", JettyHttpComponent.class); jetty.setSslSocketConnectors(connectors); - // add jetty to camel context - context.addComponent("jetty", jetty); // END SNIPPET: e1 from("jetty:https://localhost:"; + port1 + "/test").to("mock:a"); http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java index 309a494..990de9f 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java @@ -40,13 +40,6 @@ public class ExplicitJettyRouteTest extends BaseJettyTest { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { - // START SNIPPET: e1 - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); - // add jetty to camel context - context.addComponent("jetty", jetty); - // END SNIPPET: e1 - from("jetty:http://localhost:{{port}}/myapp/myservice";).process(new MyBookService()); } }; http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAddSslConnectorPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAddSslConnectorPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAddSslConnectorPropertiesTest.java index 395a7cb..53753fd 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAddSslConnectorPropertiesTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAddSslConnectorPropertiesTest.java @@ -34,9 +34,8 @@ public class HttpsRouteAddSslConnectorPropertiesTest extends HttpsRouteTest { URL keyStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks"); String path = keyStoreUrl.toURI().getPath(); - JettyHttpComponent jetty = new JettyHttpComponent(); + JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class); setSSLProps(jetty, path, pwd, pwd); - context.addComponent("jetty", jetty); // END SNIPPET: e1 from("jetty:https://localhost:"; + port1 + "/test").to("mock:a"); http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java index c6cbd13..c7477db 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java @@ -31,8 +31,7 @@ public class HttpsRouteAliasTest extends HttpsRouteTest { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws URISyntaxException { - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); + JettyHttpComponent jetty = context.getComponent("jetty", JettyHttpComponent.class); KeyStoreParameters ksp = new KeyStoreParameters(); ksp.setResource(this.getClass().getClassLoader().getResource("jsse/localhost-alias.ks").toString()); @@ -49,7 +48,6 @@ public class HttpsRouteAliasTest extends HttpsRouteTest { sslContextParameters.setCertAlias("server"); jetty.setSslContextParameters(sslContextParameters); setSSLProps(jetty, "", "asdfasdfasdfdasfs", "sadfasdfasdfas"); - context.addComponent("jetty", jetty); from("jetty:https://localhost:"; + port1 + "/test").to("mock:a"); http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInComponentTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInComponentTest.java index 9850e02..378f77c 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInComponentTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInComponentTest.java @@ -31,8 +31,7 @@ public class HttpsRouteSslContextParametersInComponentTest extends HttpsRouteTes protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws URISyntaxException { - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); + JettyHttpComponent jetty = getContext().getComponent("jetty", JettyHttpComponent.class); KeyStoreParameters ksp = new KeyStoreParameters(); ksp.setResource(this.getClass().getClassLoader().getResource("jsse/localhost.ks").toString()); @@ -48,9 +47,6 @@ public class HttpsRouteSslContextParametersInComponentTest extends HttpsRouteTes // NOTE: These are here to check that they are properly ignored. setSSLProps(jetty, "", "asdfasdfasdfdasfs", "sadfasdfasdfas"); - // add jetty to camel context - context.addComponent("jetty", jetty); - from("jetty:https://localhost:"; + port1 + "/test").to("mock:a"); Processor proc = new Processor() { http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java index 00c4dfc..43c8349 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java @@ -51,10 +51,9 @@ public class HttpsRouteSslContextParametersInUriTest extends HttpsRouteTest { protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws URISyntaxException { - JettyHttpComponent jetty = new JettyHttpComponent(); + JettyHttpComponent jetty = getContext().getComponent("jetty", JettyHttpComponent.class); // NOTE: These are here to check that they are properly ignored. setSSLProps(jetty, "", "asdfasdfasdfdasfs", "sadfasdfasdfas"); - context.addComponent("jetty", jetty); from("jetty:https://localhost:"; + port1 + "/test?sslContextParametersRef=sslContextParameters").to("mock:a"); http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java index 4f8bc88..a6df3ea 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java @@ -34,12 +34,8 @@ public class HttpsRouteWithSslConnectorPropertiesTest extends HttpsRouteTest { URL keyStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks"); String path = keyStoreUrl.toURI().getPath(); - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); + JettyHttpComponent jetty = getContext().getComponent("jetty", JettyHttpComponent.class); setSSLProps(jetty, path, pwd, pwd); - - // add jetty to camel context - context.addComponent("jetty", jetty); // END SNIPPET: e1 from("jetty:https://localhost:"; + port1 + "/test").to("mock:a"); http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java index f41d492..86ef152 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java @@ -18,6 +18,7 @@ package org.apache.camel.component.jetty; import java.util.HashMap; import java.util.Map; + import javax.servlet.http.HttpServletRequest; import org.apache.camel.Exchange; @@ -49,12 +50,8 @@ public class JettyRouteWithSocketPropertiesTest extends BaseJettyTest { properties.put("statsOn", "false"); properties.put("soLingerTime", "5000"); - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); - // set properties + JettyHttpComponent jetty = getContext().getComponent("jetty", JettyHttpComponent.class); jetty.setSocketConnectorProperties(properties); - // add jetty to camel context - context.addComponent("jetty", jetty); // END SNIPPET: e1 from("jetty:http://localhost:{{port}}/myapp/myservice";).process(new MyBookService()); http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java index e8f6b5d..a15828d 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java @@ -43,12 +43,8 @@ public class JettyRouteWithUnknownSocketPropertiesTest extends BaseJettyTest { properties.put("soLingerTime", "5000"); properties.put("doesNotExist", 2000); - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); - // set properties + JettyHttpComponent jetty = getContext().getComponent("jetty", JettyHttpComponent.class); jetty.setSocketConnectorProperties(properties); - // add jetty to camel context - context.addComponent("jetty", jetty); from("jetty:http://localhost:{{port}}/myapp/myservice";).to("log:foo"); } http://git-wip-us.apache.org/repos/asf/camel/blob/0e076c01/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java index 0ef08d5..98e9df1 100644 --- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java +++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java @@ -43,12 +43,8 @@ public class JettyRouteWithUnknownSslSocketPropertiesTest extends BaseJettyTest properties.put("soLingerTime", "5000"); properties.put("doesNotExist", 2000); - // create jetty component - JettyHttpComponent jetty = new JettyHttpComponent(); - // set properties + JettyHttpComponent jetty = getContext().getComponent("jetty", JettyHttpComponent.class); jetty.setSslSocketConnectorProperties(properties); - // add jetty to camel context - context.addComponent("jetty", jetty); from("jetty:https://localhost:{{port}}/myapp/myservice";).to("log:foo"); }
