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:48 UTC
[7/7] camel git commit: should be using references everywhere
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");
}
};
}