You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2017/04/07 17:44:42 UTC
[1/7] camel git commit: remove deprecated sslContextParametersRef
that is already removed elsewhere
Repository: camel
Updated Branches:
refs/heads/master e0fed4569 -> 179399aa8
remove deprecated sslContextParametersRef that is already removed elsewhere
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8bd8ee11
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8bd8ee11
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8bd8ee11
Branch: refs/heads/master
Commit: 8bd8ee11887276c85d66533914135a1f47c82e9a
Parents: e0fed45
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Apr 7 10:20:09 2017 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Apr 7 14:44:58 2017 -0230
----------------------------------------------------------------------
.../camel/component/websocket/WebsocketComponent.java | 12 ++----------
.../WebsocketSSLContextInUriRouteExampleTest.java | 2 +-
2 files changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8bd8ee11/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 9b8c878..04169d0 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -276,11 +276,8 @@ public class WebsocketComponent extends UriEndpointComponent {
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- // TODO cmueller: remove the "sslContextParametersRef" look up in Camel 3.0
- SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", SSLContextParameters.class);
- if (sslContextParameters == null) {
- sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", SSLContextParameters.class);
- }
+ SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", SSLContextParameters.class);
+
Boolean enableJmx = getAndRemoveParameter(parameters, "enableJmx", Boolean.class);
String staticResources = getAndRemoveParameter(parameters, "staticResources", String.class);
int port = extractPortNumber(remaining);
@@ -294,11 +291,6 @@ public class WebsocketComponent extends UriEndpointComponent {
endpoint.setEnableJmx(isEnableJmx());
}
- /*
- if (sslContextParameters == null) {
- sslContextParameters = this.sslContextParameters;
- } */
-
// prefer to use endpoint configured over component configured
if (sslContextParameters == null) {
// fallback to component configured
http://git-wip-us.apache.org/repos/asf/camel/blob/8bd8ee11/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
index 7e87226..235b641 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java
@@ -67,7 +67,7 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport {
URL trustStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks");
setSystemProp("javax.net.ssl.trustStore", trustStoreUrl.toURI().getPath());
- uri = "websocket://" + server + ":" + port + "/test?sslContextParametersRef=#sslContextParameters";
+ uri = "websocket://" + server + ":" + port + "/test?sslContextParameters=#sslContextParameters";
super.setUp();
}
[4/7] camel git commit: get rid of deprecated sslContextParametersRef
option in jetty, was removed elsewhere ages ago
Posted by ja...@apache.org.
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 <ja...@gmail.com>
Authored: Fri Apr 7 12:27:53 2017 -0230
Committer: Jonathan Anstey <ja...@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
+}
[5/7] camel git commit: align tests with docs
Posted by ja...@apache.org.
align tests with docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/039e6729
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/039e6729
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/039e6729
Branch: refs/heads/master
Commit: 039e672990e70f777db4d9e4d09cd1f613d10666
Parents: ca4f856
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Apr 7 14:54:15 2017 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Apr 7 14:54:15 2017 -0230
----------------------------------------------------------------------
.../ahc/AhcComponentClientConfigSslContextParametersTest.java | 4 ++--
.../component/ahc/AhcProduceSSLContextParametersGetTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/039e6729/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index cce907c..dc429cd 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -28,11 +28,11 @@ public class AhcComponentClientConfigSslContextParametersTest extends AhcCompone
}
protected String getTestServerEndpointUri() {
- return super.getTestServerEndpointUri() + "?sslContextParametersRef=sslContextParameters";
+ return super.getTestServerEndpointUri() + "?sslContextParameters=sslContextParameters";
}
protected String getTestServerEndpointTwoUri() {
- return super.getTestServerEndpointTwoUri() + "?sslContextParametersRef=sslContextParameters";
+ return super.getTestServerEndpointTwoUri() + "?sslContextParameters=sslContextParameters";
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/039e6729/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
index a5ed453..4737415 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProduceSSLContextParametersGetTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.ahc;
public class AhcProduceSSLContextParametersGetTest extends AhcProduceGetTest {
protected String getTestServerEndpointUri() {
- return super.getTestServerEndpointUri() + "?sslContextParametersRef=sslContextParameters";
+ return super.getTestServerEndpointUri() + "?sslContextParameters=#sslContextParameters";
}
protected String getAhcEndpointUri() {
[2/7] camel git commit: doc update
Posted by ja...@apache.org.
doc update
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ca4f8567
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca4f8567
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca4f8567
Branch: refs/heads/master
Commit: ca4f8567814c5679fb8a4ef8056a463400b0a286
Parents: 19f6a4e
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Apr 7 14:44:53 2017 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Apr 7 14:44:59 2017 -0230
----------------------------------------------------------------------
components/camel-jetty9/src/main/docs/jetty-component.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ca4f8567/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 770a6a9..4052e39 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -117,7 +117,7 @@ with the following path and query parameters:
| **httpUri** | *Required* The url of the HTTP endpoint to call. | | URI
|=======================================================================
-#### Query Parameters (55 parameters):
+#### Query Parameters (54 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
|=======================================================================
[6/7] camel git commit: few more refs to sslContextParametersRef
Posted by ja...@apache.org.
few more refs to sslContextParametersRef
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d969258b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d969258b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d969258b
Branch: refs/heads/master
Commit: d969258bc9a7cb6adcbc7fd0e7d33cc76c9543e7
Parents: 039e672
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Apr 7 14:59:03 2017 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Apr 7 14:59:03 2017 -0230
----------------------------------------------------------------------
components/camel-http4/src/main/docs/http4-component.adoc | 2 +-
.../http4/HttpsTwoComponentsSslContextParametersGetTest.java | 4 ++--
.../http4/HttpsTwoDifferentSslContextParametersGetTest.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d969258b/components/camel-http4/src/main/docs/http4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc
index 00e7442..43644df 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -555,7 +555,7 @@ Spring DSL based configuration of endpoint
</camel:keyManagers>
</camel:sslContextParameters>...
...
- <to uri="https4://127.0.0.1/mail/?sslContextParametersRef=sslContextParameters"/>...
+ <to uri="https4://127.0.0.1/mail/?sslContextParameters=#sslContextParameters"/>...
--------------------------------------------------------------------------------------
[[HTTP4-ConfiguringApacheHTTPClientDirectly]]
http://git-wip-us.apache.org/repos/asf/camel/blob/d969258b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
index 03ac012..8d33d72 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
@@ -83,10 +83,10 @@ public class HttpsTwoComponentsSslContextParametersGetTest extends BaseHttpsTest
port2 = AvailablePortFinder.getNextAvailable(localServer.getLocalPort());
from("direct:foo")
- .to("http4s-foo://127.0.0.1:" + localServer.getLocalPort() + "/mail?x509HostnameVerifier=x509HostnameVerifier&sslContextParametersRef=sslContextParameters");
+ .to("http4s-foo://127.0.0.1:" + localServer.getLocalPort() + "/mail?x509HostnameVerifier=x509HostnameVerifier&sslContextParameters=#sslContextParameters");
from("direct:bar")
- .to("http4s-bar://127.0.0.1:" + port2 + "/mail?x509HostnameVerifier=x509HostnameVerifier&sslContextParametersRef=sslContextParameters2");
+ .to("http4s-bar://127.0.0.1:" + port2 + "/mail?x509HostnameVerifier=x509HostnameVerifier&sslContextParameters=#sslContextParameters2");
}
});
http://git-wip-us.apache.org/repos/asf/camel/blob/d969258b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
index fc0c1ee..96f732f 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoDifferentSslContextParametersGetTest.java
@@ -78,10 +78,10 @@ public class HttpsTwoDifferentSslContextParametersGetTest extends BaseHttpsTest
@Override
public void configure() throws Exception {
from("direct:foo")
- .to("https4://127.0.0.1:" + localServer.getLocalPort() + "/mail?x509HostnameVerifier=x509HostnameVerifier&sslContextParametersRef=sslContextParameters");
+ .to("https4://127.0.0.1:" + localServer.getLocalPort() + "/mail?x509HostnameVerifier=x509HostnameVerifier&sslContextParameters=#sslContextParameters");
from("direct:bar")
- .to("https4://127.0.0.1:" + localServer.getLocalPort() + "/mail?x509HostnameVerifier=x509HostnameVerifier&sslContextParametersRef=sslContextParameters2");
+ .to("https4://127.0.0.1:" + localServer.getLocalPort() + "/mail?x509HostnameVerifier=x509HostnameVerifier&sslContextParameters=#sslContextParameters2");
}
});
try {
[3/7] camel git commit: fix sslContextParameters prop in test
Posted by ja...@apache.org.
fix sslContextParameters prop in test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/296fc70a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/296fc70a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/296fc70a
Branch: refs/heads/master
Commit: 296fc70aab4b52c04a72efea70eaa62cfb9ce7f0
Parents: 8bd8ee1
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Apr 7 12:07:35 2017 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Apr 7 14:44:59 2017 -0230
----------------------------------------------------------------------
.../camel/component/http4/HttpsSslContextParametersGetTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/296fc70a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
index abd3aaa..d9b9bcf 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
@@ -68,7 +68,7 @@ public class HttpsSslContextParametersGetTest extends HttpsGetTest {
public void httpsGet() throws Exception {
Exchange exchange = template.request("https4://127.0.0.1:" + localServer.getLocalPort()
- + "/mail/?x509HostnameVerifier=x509HostnameVerifier&sslContextParametersRef=sslContextParameters", new Processor() {
+ + "/mail/?x509HostnameVerifier=x509HostnameVerifier&sslContextParameters=sslContextParameters", new Processor() {
public void process(Exchange exchange) throws Exception {
}
});
[7/7] camel git commit: should be using references everywhere
Posted by ja...@apache.org.
should be using references everywhere
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/179399aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/179399aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/179399aa
Branch: refs/heads/master
Commit: 179399aa88576e72d77450518b5824a07bed492c
Parents: d969258
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Fri Apr 7 15:14:18 2017 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Fri Apr 7 15:14:18 2017 -0230
----------------------------------------------------------------------
.../AhcComponentClientConfigSslContextParametersTest.java | 4 ++--
.../component/http4/HttpsSslContextParametersGetTest.java | 2 +-
.../apache/camel/component/http4/CamelHttp4Context.xml | 8 ++++----
.../camel-jetty9/src/main/docs/jetty-component.adoc | 2 +-
.../jetty/HttpsRouteSslContextParametersInUriTest.java | 6 +++---
.../JettyHttpsProducerSslContextInUriTest.java | 10 +++++-----
6 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
index dc429cd..f0cc8b3 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigSslContextParametersTest.java
@@ -28,11 +28,11 @@ public class AhcComponentClientConfigSslContextParametersTest extends AhcCompone
}
protected String getTestServerEndpointUri() {
- return super.getTestServerEndpointUri() + "?sslContextParameters=sslContextParameters";
+ return super.getTestServerEndpointUri() + "?sslContextParameters=#sslContextParameters";
}
protected String getTestServerEndpointTwoUri() {
- return super.getTestServerEndpointTwoUri() + "?sslContextParameters=sslContextParameters";
+ return super.getTestServerEndpointTwoUri() + "?sslContextParameters=#sslContextParameters";
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
index d9b9bcf..0071290 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsSslContextParametersGetTest.java
@@ -68,7 +68,7 @@ public class HttpsSslContextParametersGetTest extends HttpsGetTest {
public void httpsGet() throws Exception {
Exchange exchange = template.request("https4://127.0.0.1:" + localServer.getLocalPort()
- + "/mail/?x509HostnameVerifier=x509HostnameVerifier&sslContextParameters=sslContextParameters", new Processor() {
+ + "/mail/?x509HostnameVerifier=x509HostnameVerifier&sslContextParameters=#sslContextParameters", new Processor() {
public void process(Exchange exchange) throws Exception {
}
});
http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml b/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
index 221947b..7969a8b 100644
--- a/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
+++ b/components/camel-http4/src/test/resources/org/apache/camel/component/http4/CamelHttp4Context.xml
@@ -60,18 +60,18 @@
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
<route errorHandlerRef="noErrorHandler">
<from uri="direct:goodSNI"/>
- <to uri="https4://www.mnot.net?sslContextParameters=correctSniSslContextParameters"/>
+ <to uri="https4://www.mnot.net?sslContextParameters=#correctSniSslContextParameters"/>
</route>
<route errorHandlerRef="noErrorHandler">
<from uri="direct:wrongSNI"/>
- <to uri="https4-wrong://www.mnot.net?sslContextParameters=wrongSniSslContextParameters"/>
+ <to uri="https4-wrong://www.mnot.net?sslContextParameters=#wrongSniSslContextParameters"/>
</route>
<route errorHandlerRef="noErrorHandler">
<from uri="direct:noSNI"/>
- <to uri="https4-no://www.mnot.net?sslContextParameters=noSniSslContextParameters"/>
+ <to uri="https4-no://www.mnot.net?sslContextParameters=#noSniSslContextParameters"/>
</route>
</camelContext>
<bean id="noErrorHandler" class="org.apache.camel.builder.NoErrorHandlerBuilder"/>
-</beans>
\ No newline at end of file
+</beans>
http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/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 4052e39..92853f3 100644
--- a/components/camel-jetty9/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty9/src/main/docs/jetty-component.adoc
@@ -353,7 +353,7 @@ Spring DSL based configuration of endpoint
</camel:keyManagers>
</camel:sslContextParameters>...
...
- <to uri="jetty:https://127.0.0.1/mail/?sslContextParameters=sslContextParameters"/>
+ <to uri="jetty:https://127.0.0.1/mail/?sslContextParameters=#sslContextParameters"/>
...
----------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/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 f4b4876..6c9c39b 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,16 +55,16 @@ 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?sslContextParameters=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?sslContextParameters=sslContextParameters").process(proc);
+ from("jetty:https://localhost:" + port1 + "/hello?sslContextParameters=#sslContextParameters").process(proc);
- from("jetty:https://localhost:" + port2 + "/test?sslContextParameters=sslContextParameters").to("mock:b");
+ from("jetty:https://localhost:" + port2 + "/test?sslContextParameters=#sslContextParameters").to("mock:b");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/179399aa/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 2b89643..041c7e6 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?sslContextParameters=sslContextParameters", expectedBody, "Content-Type",
+ template.sendBodyAndHeader(getHttpProducerScheme() + "localhost:" + port1 + "/test?sslContextParameters=#sslContextParameters", expectedBody, "Content-Type",
"application/xml");
- template.sendBodyAndHeader(getHttpProducerScheme() + "localhost:" + port2 + "/test?sslContextParameters=sslContextParameters", expectedBody, "Content-Type",
+ template.sendBodyAndHeader(getHttpProducerScheme() + "localhost:" + port2 + "/test?sslContextParameters=#sslContextParameters", expectedBody, "Content-Type",
"application/xml");
}
@@ -71,16 +71,16 @@ 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?sslContextParameters=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?sslContextParameters=sslContextParameters").process(proc);
+ from("jetty:https://localhost:" + port1 + "/hello?sslContextParameters=#sslContextParameters").process(proc);
- from("jetty:https://localhost:" + port2 + "/test?sslContextParameters=sslContextParameters").to("mock:b");
+ from("jetty:https://localhost:" + port2 + "/test?sslContextParameters=#sslContextParameters").to("mock:b");
}
};
}