get rid of deprecated sslContextParametersRef option in jetty, was removed elsewhere ages ago
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19f6a4ec Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19f6a4ec Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19f6a4ec Branch: refs/heads/master Commit: 19f6a4ecac86987ba4f8b374abc6dc3e24be9f19 Parents: 296fc70 Author: Jonathan Anstey <jans...@gmail.com> Authored: Fri Apr 7 12:27:53 2017 -0230 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Fri Apr 7 14:44:59 2017 -0230 ---------------------------------------------------------------------- .../camel/component/jetty/JettyHttpComponent.java | 2 +- .../camel/component/jetty/JettyHttpEndpoint.java | 17 ----------------- .../src/main/docs/jetty-component.adoc | 3 +-- .../HttpsRouteSslContextParametersInUriTest.java | 8 ++++---- .../JettyHttpsProducerSslContextInUriTest.java | 12 ++++++------ 5 files changed, 12 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/19f6a4ec/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java index 2071e4a..6e7e667 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java @@ -183,7 +183,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements Boolean enableCors = getAndRemoveParameter(parameters, "enableCORS", Boolean.class, false); HeaderFilterStrategy headerFilterStrategy = resolveAndRemoveReferenceParameter(parameters, "headerFilterStrategy", HeaderFilterStrategy.class); UrlRewrite urlRewrite = resolveAndRemoveReferenceParameter(parameters, "urlRewrite", UrlRewrite.class); - SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", SSLContextParameters.class); + SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", SSLContextParameters.class); SSLContextParameters ssl = sslContextParameters != null ? sslContextParameters : this.sslContextParameters; String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class, getProxyHost()); Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class, getProxyPort()); http://git-wip-us.apache.org/repos/asf/camel/blob/19f6a4ec/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java index 9d2a291..dc7ea51 100644 --- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java +++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java @@ -126,10 +126,6 @@ public abstract class JettyHttpEndpoint extends HttpCommonEndpoint { @UriParam(label = "security", description = "To configure security using SSLContextParameters") private SSLContextParameters sslContextParameters; - @UriParam(label = "security", - description = "To configure security using SSLContextParameters") - @Deprecated - private String sslContextParametersRef; @UriParam(label = "producer", description = "Configure a cookie handler to maintain a HTTP session") private CookieHandler cookieHandler; @@ -367,19 +363,6 @@ public abstract class JettyHttpEndpoint extends HttpCommonEndpoint { this.sslContextParameters = sslContextParameters; } - @Deprecated - public String getSslContextParametersRef() { - return sslContextParametersRef; - } - - /** - * To configure security using SSLContextParameters - */ - @Deprecated - public void setSslContextParametersRef(String sslContextParametersRef) { - this.sslContextParametersRef = sslContextParametersRef; - } - public Integer getHttpClientMinThreads() { return httpClientMinThreads; } http://git-wip-us.apache.org/repos/asf/camel/blob/19f6a4ec/components/camel-jetty9/src/main/docs/jetty-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/main/docs/jetty-component.adoc b/components/camel-jetty9/src/main/docs/jetty-component.adoc index 222ecf4..770a6a9 100644 --- a/components/camel-jetty9/src/main/docs/jetty-component.adoc +++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc @@ -176,7 +176,6 @@ with the following path and query parameters: | **proxyPort** (proxy) | Proxy port to use | | int | **authHost** (security) | Authentication host to use with NTML | | String | **sslContextParameters** (security) | To configure security using SSLContextParameters | | SSLContextParameters -| **sslContextParametersRef** (security) | To configure security using SSLContextParameters | | String |======================================================================= // endpoint options: END @@ -354,7 +353,7 @@ Spring DSL based configuration of endpoint </camel:keyManagers> </camel:sslContextParameters>... ... - <to uri="jetty:https://127.0.0.1/mail/?sslContextParametersRef=sslContextParameters"/> + <to uri="jetty:https://127.0.0.1/mail/?sslContextParameters=sslContextParameters"/> ... ---------------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/19f6a4ec/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java index 43c8349..f4b4876 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteSslContextParametersInUriTest.java @@ -55,17 +55,17 @@ public class HttpsRouteSslContextParametersInUriTest extends HttpsRouteTest { // NOTE: These are here to check that they are properly ignored. setSSLProps(jetty, "", "asdfasdfasdfdasfs", "sadfasdfasdfas"); - from("jetty:https://localhost:"; + port1 + "/test?sslContextParametersRef=sslContextParameters").to("mock:a"); + from("jetty:https://localhost:"; + port1 + "/test?sslContextParameters=sslContextParameters").to("mock:a"); Processor proc = new Processor() { public void process(Exchange exchange) throws Exception { exchange.getOut().setBody("<b>Hello World</b>"); } }; - from("jetty:https://localhost:"; + port1 + "/hello?sslContextParametersRef=sslContextParameters").process(proc); + from("jetty:https://localhost:"; + port1 + "/hello?sslContextParameters=sslContextParameters").process(proc); - from("jetty:https://localhost:"; + port2 + "/test?sslContextParametersRef=sslContextParameters").to("mock:b"); + from("jetty:https://localhost:"; + port2 + "/test?sslContextParameters=sslContextParameters").to("mock:b"); } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/camel/blob/19f6a4ec/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerSslContextInUriTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerSslContextInUriTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerSslContextInUriTest.java index 7236389..2b89643 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerSslContextInUriTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerSslContextInUriTest.java @@ -55,9 +55,9 @@ public class JettyHttpsProducerSslContextInUriTest extends JettyProducerHttpsRou } protected void invokeHttpEndpoint() throws IOException { - template.sendBodyAndHeader(getHttpProducerScheme() + "localhost:" + port1 + "/test?sslContextParametersRef=sslContextParameters", expectedBody, "Content-Type", + template.sendBodyAndHeader(getHttpProducerScheme() + "localhost:" + port1 + "/test?sslContextParameters=sslContextParameters", expectedBody, "Content-Type", "application/xml"); - template.sendBodyAndHeader(getHttpProducerScheme() + "localhost:" + port2 + "/test?sslContextParametersRef=sslContextParameters", expectedBody, "Content-Type", + template.sendBodyAndHeader(getHttpProducerScheme() + "localhost:" + port2 + "/test?sslContextParameters=sslContextParameters", expectedBody, "Content-Type", "application/xml"); } @@ -71,17 +71,17 @@ public class JettyHttpsProducerSslContextInUriTest extends JettyProducerHttpsRou URL keyStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks"); componentJetty.setKeystore(keyStoreUrl.toURI().getPath()); - from("jetty:https://localhost:"; + port1 + "/test?sslContextParametersRef=sslContextParameters").to("mock:a"); + from("jetty:https://localhost:"; + port1 + "/test?sslContextParameters=sslContextParameters").to("mock:a"); Processor proc = new Processor() { public void process(Exchange exchange) throws Exception { exchange.getOut().setBody("<b>Hello World</b>"); } }; - from("jetty:https://localhost:"; + port1 + "/hello?sslContextParametersRef=sslContextParameters").process(proc); + from("jetty:https://localhost:"; + port1 + "/hello?sslContextParameters=sslContextParameters").process(proc); - from("jetty:https://localhost:"; + port2 + "/test?sslContextParametersRef=sslContextParameters").to("mock:b"); + from("jetty:https://localhost:"; + port2 + "/test?sslContextParameters=sslContextParameters").to("mock:b"); } }; } -} \ No newline at end of file +}
