You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2019/06/14 18:54:53 UTC
[camel] 02/02: Some fixes for the last merge
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a61ba9acaf82b695fa28e2eada71b0784b26fb8b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jun 14 19:54:13 2019 +0100
Some fixes for the last merge
---
.../jetty/rest/RestHttpsClientAuthRouteTest.java | 28 +++++++++++++--------
.../camel-jetty9/src/test/resources/service.jks | Bin 0 -> 1969 bytes
.../camel-jetty9/src/test/resources/truststore.jks | Bin 0 -> 582 bytes
.../internal/client/SalesforceHttpRequest.java | 2 +-
.../WebsocketSSLClientAuthRouteExampleTest.java | 12 ++++-----
5 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
index 5d698ed..80aa831 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestHttpsClientAuthRouteTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -22,20 +22,21 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.model.rest.RestConfigurationDefinition;
-import org.apache.camel.support.jsse.KeyManagersParameters;
-import org.apache.camel.support.jsse.KeyStoreParameters;
-import org.apache.camel.support.jsse.SSLContextParameters;
-import org.apache.camel.support.jsse.SSLContextServerParameters;
-import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.jsse.KeyManagersParameters;
+import org.apache.camel.util.jsse.KeyStoreParameters;
+import org.apache.camel.util.jsse.SSLContextParameters;
+import org.apache.camel.util.jsse.SSLContextServerParameters;
+import org.apache.camel.util.jsse.TrustManagersParameters;
import org.junit.Test;
public class RestHttpsClientAuthRouteTest extends CamelTestSupport {
static int port = AvailablePortFinder.getNextAvailable();
- @Produce("direct:start")
+ @Produce(uri = "direct:start")
protected ProducerTemplate sender;
@@ -52,7 +53,10 @@ public class RestHttpsClientAuthRouteTest extends CamelTestSupport {
return "http4://localhost:%d/TestResource/some-id?sslContextParameters=#clientSSLContextParameters";
}
- protected void decorateRestConfiguration(RestConfigurationDefinition restConfig) {
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry registry = super.createRegistry();
+
KeyStoreParameters keystoreParameters = new KeyStoreParameters();
keystoreParameters.setResource("service.jks");
keystoreParameters.setPassword("security");
@@ -84,9 +88,13 @@ public class RestHttpsClientAuthRouteTest extends CamelTestSupport {
clientAuthClientSSLKeyManagers.setKeyStore(keystoreParameters);
clientSSLContextParameters.setKeyManagers(clientAuthClientSSLKeyManagers);
- context.getRegistry().bind("serviceSSLContextParameters", serviceSSLContextParameters);
- context.getRegistry().bind("clientSSLContextParameters", clientSSLContextParameters);
+ registry.bind("serviceSSLContextParameters", serviceSSLContextParameters);
+ registry.bind("clientSSLContextParameters", clientSSLContextParameters);
+ return registry;
+ }
+
+ protected void decorateRestConfiguration(RestConfigurationDefinition restConfig) {
restConfig.endpointProperty("sslContextParameters", "#serviceSSLContextParameters");
}
diff --git a/components/camel-jetty9/src/test/resources/service.jks b/components/camel-jetty9/src/test/resources/service.jks
new file mode 100644
index 0000000..52321ad
Binary files /dev/null and b/components/camel-jetty9/src/test/resources/service.jks differ
diff --git a/components/camel-jetty9/src/test/resources/truststore.jks b/components/camel-jetty9/src/test/resources/truststore.jks
new file mode 100644
index 0000000..44d82a85
Binary files /dev/null and b/components/camel-jetty9/src/test/resources/truststore.jks differ
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceHttpRequest.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceHttpRequest.java
index 743ec32..19985ed 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceHttpRequest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceHttpRequest.java
@@ -32,7 +32,7 @@ public class SalesforceHttpRequest extends HttpRequest {
}
@Override
- protected HttpConversation getConversation() {
+ public HttpConversation getConversation() {
return super.getConversation();
}
}
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
index 2853542..dc98826 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLClientAuthRouteExampleTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -29,13 +29,13 @@ import javax.net.ssl.SSLContext;
import io.netty.handler.ssl.ClientAuth;
import io.netty.handler.ssl.JdkSslContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.support.jsse.KeyManagersParameters;
-import org.apache.camel.support.jsse.KeyStoreParameters;
-import org.apache.camel.support.jsse.SSLContextParameters;
-import org.apache.camel.support.jsse.SSLContextServerParameters;
-import org.apache.camel.support.jsse.TrustManagersParameters;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.jsse.KeyManagersParameters;
+import org.apache.camel.util.jsse.KeyStoreParameters;
+import org.apache.camel.util.jsse.SSLContextParameters;
+import org.apache.camel.util.jsse.SSLContextServerParameters;
+import org.apache.camel.util.jsse.TrustManagersParameters;
import org.asynchttpclient.AsyncHttpClient;
import org.asynchttpclient.AsyncHttpClientConfig;
import org.asynchttpclient.DefaultAsyncHttpClient;