Repository: camel
Updated Branches:
refs/heads/master f501bf969 -> c76dec5a1
Avoid direct usage of impl class
Conflicts:
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteAliasTest.java
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpsRouteWithSslConnectorPropertiesTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c76dec5a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c76dec5a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c76dec5a
Branch: refs/heads/master
Commit: c76dec5a1a657ca7bf83c4a25f2ac9c63898e8bf
Parents: f501bf9
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 18:13:37 2014 +0100
----------------------------------------------------------------------
.../component/jetty/ExplicitHttpsRouteTest.java | 6 +-----
...ExplicitHttpsSslContextParametersRouteTest.java | 6 +-----
.../component/jetty/ExplicitJettyRouteTest.java | 2 +-
.../HttpsRouteAddSslConnectorPropertiesTest.java | 3 +--
.../camel/component/jetty/HttpsRouteAliasTest.java | 14 +++-----------
...psRouteSslContextParametersInComponentTest.java | 6 +-----
.../HttpsRouteSslContextParametersInUriTest.java | 3 +--
.../HttpsRouteWithSslConnectorPropertiesTest.java | 17 +++--------------
.../jetty/JettyRouteWithSocketPropertiesTest.java | 7 ++-----
.../JettyRouteWithUnknownSocketPropertiesTest.java | 6 +-----
...ttyRouteWithUnknownSslSocketPropertiesTest.java | 6 +-----
11 files changed, 16 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c76dec5a/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 2d32e3b..179f18c 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
@@ -53,12 +53,8 @@ public class ExplicitHttpsRouteTest extends HttpsRouteTest {
connectors.put(port1, createSslSocketConnector(port1));
connectors.put(port2, createSslSocketConnector(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/c76dec5a/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 65ff41d..0bec7d1 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
@@ -63,12 +63,8 @@ public class ExplicitHttpsSslContextParametersRouteTest
extends HttpsRouteTest {
connectors.put(port1, createSslSocketConnector(getContext(),
port1));
connectors.put(port2, createSslSocketConnector(getContext(),
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/c76dec5a/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 9a632cc..ebeac49 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
@@ -89,4 +89,4 @@ public class ExplicitJettyRouteTest extends BaseJettyTest {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c76dec5a/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/c76dec5a/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 47a3595..1c99e5d 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());
@@ -50,14 +49,7 @@ public class HttpsRouteAliasTest extends HttpsRouteTest {
jetty.setSslContextParameters(sslContextParameters);
- // NOTE: These are here to check that they are properly
ignored.
- jetty.addSslSocketConnectorProperty("keyPassword",
"sadfasdfasdfas");
- jetty.addSslSocketConnectorProperty("password",
"asdfasdfasdfdasfs");
- jetty.addSslSocketConnectorProperty("keystore", "");
- jetty.addSslSocketConnectorProperty("truststoreType", "JKS");
-
- // add jetty to camel context
- context.addComponent("jetty", jetty);
+ setSSLProps(jetty, "", "asdfasdfasdfdasfs", "sadfasdfasdfas");
from("jetty:https://localhost:"; + port1 +
"/test").to("mock:a");
@@ -72,4 +64,4 @@ public class HttpsRouteAliasTest extends HttpsRouteTest {
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c76dec5a/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/c76dec5a/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/c76dec5a/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 c6e51a4..b85bd61 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
@@ -36,19 +36,8 @@ public class HttpsRouteWithSslConnectorPropertiesTest
extends HttpsRouteTest {
URL keyStoreUrl =
this.getClass().getClassLoader().getResource("jsse/localhost.ks");
String path = keyStoreUrl.toURI().getPath();
- // map with properties
- Map<String, Object> properties = new HashMap<String, Object>();
- properties.put("keyPassword", pwd);
- properties.put("password", pwd);
- properties.put("keystore", path);
- properties.put("truststoreType", "JKS");
-
- // create jetty component
- JettyHttpComponent jetty = new JettyHttpComponent();
- jetty.setSslSocketConnectorProperties(properties);
-
- // add jetty to camel context
- context.addComponent("jetty", jetty);
+ JettyHttpComponent jetty = getContext().getComponent("jetty",
JettyHttpComponent.class);
+ setSSLProps(jetty, path, pwd, pwd);
// END SNIPPET: e1
from("jetty:https://localhost:"; + port1 +
"/test").to("mock:a");
@@ -64,4 +53,4 @@ public class HttpsRouteWithSslConnectorPropertiesTest extends
HttpsRouteTest {
}
};
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/c76dec5a/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/c76dec5a/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 fda7165..4d37bcc 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
@@ -41,12 +41,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/c76dec5a/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 1dbbfac..4009a13 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
@@ -41,12 +41,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");
}
