Updated docker-java library version. Code cleanup
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d588ca1c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d588ca1c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d588ca1c Branch: refs/heads/master Commit: d588ca1c5f0eb81d696fb01a2b6dbb8e3d4b470d Parents: e3794c0 Author: Andrew Block <andy.bl...@gmail.com> Authored: Wed Nov 5 23:16:24 2014 -0600 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Nov 9 08:16:49 2014 +0100 ---------------------------------------------------------------------- components/camel-docker/pom.xml | 3 +-- .../component/docker/DockerClientFactory.java | 13 ++++++---- .../component/docker/DockerClientProfile.java | 25 ++++++++++++++++---- .../component/docker/DockerConfiguration.java | 2 +- .../camel/component/docker/DockerConstants.java | 4 +++- .../camel/component/docker/DockerHelper.java | 17 +++++++------ .../docker/consumer/DockerEventsConsumer.java | 1 - .../docker/producer/DockerProducer.java | 14 +++++------ .../docker/DockerClientProfileTest.java | 3 +++ .../docker/DockerConfigurationTest.java | 3 ++- .../component/docker/RemoveImageCmdUriTest.java | 3 +++ .../docker/headers/AuthCmdHeaderTest.java | 4 +--- .../docker/headers/BuildImageCmdHeaderTest.java | 1 + .../docker/headers/PingCmdHeaderTest.java | 3 +-- .../docker/headers/PushImageCmdHeaderTest.java | 4 ++-- .../headers/StopContainerCmdHeaderTest.java | 1 - .../docker/it/DockerProducerTestIT.java | 12 +++++----- parent/pom.xml | 6 +++++ 18 files changed, 75 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml index bef3ffa..112f611 100644 --- a/components/camel-docker/pom.xml +++ b/components/camel-docker/pom.xml @@ -34,7 +34,6 @@ <properties> <camel.osgi.export.pkg>org.apache.camel.component.docker.*</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=docker</camel.osgi.export.service> - <docker.java.version>0.10.2</docker.java.version> <jffi.version>1.2.7</jffi.version> <jnr-x86asm.version>1.0.2</jnr-x86asm.version> </properties> @@ -49,7 +48,7 @@ <dependency> <groupId>com.github.docker-java</groupId> <artifactId>docker-java</artifactId> - <version>${docker.java.version}</version> + <version>${docker-java-version}</version> </dependency> <!-- need to avoid the snapshot dependency --> http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java index 6def16d..b1ac48b 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientFactory.java @@ -17,8 +17,10 @@ package org.apache.camel.component.docker; import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.DockerCmdExecFactory; import com.github.dockerjava.core.DockerClientBuilder; import com.github.dockerjava.core.DockerClientConfig; +import com.github.dockerjava.jaxrs.DockerCmdExecFactoryImpl; import org.apache.camel.Message; import org.apache.camel.component.docker.exception.DockerException; import org.apache.camel.util.ObjectHelper; @@ -62,7 +64,7 @@ public final class DockerClientFactory { Integer requestTimeout = DockerHelper.getProperty(DockerConstants.DOCKER_API_REQUEST_TIMEOUT, dockerConfiguration, message, Integer.class); String serverAddress = DockerHelper.getProperty(DockerConstants.DOCKER_SERVER_ADDRESS, dockerConfiguration, message, String.class); Boolean secure = DockerHelper.getProperty(DockerConstants.DOCKER_SECURE, dockerConfiguration, message, Boolean.class); - + String certPath = DockerHelper.getProperty(DockerConstants.DOCKER_CERT_PATH, dockerConfiguration, message, String.class); DockerClientProfile clientProfile = new DockerClientProfile(); clientProfile.setHost(uriHost); @@ -72,6 +74,7 @@ public final class DockerClientFactory { clientProfile.setPassword(password); clientProfile.setRequestTimeout(requestTimeout); clientProfile.setServerAddress(serverAddress); + clientProfile.setCertPath(certPath); if (secure != null && secure) { clientProfile.setSecure(secure); @@ -82,14 +85,16 @@ public final class DockerClientFactory { if (client != null) { return client; } - + DockerClientConfig.DockerClientConfigBuilder configBuilder = new DockerClientConfig.DockerClientConfigBuilder() - .withUsername(username).withPassword(password).withEmail(email).withReadTimeout(requestTimeout) + .withUsername(username).withPassword(password).withEmail(email).withReadTimeout(requestTimeout).withDockerCertPath(certPath) .withUri(clientProfile.toUrl()); DockerClientConfig config = configBuilder.build(); - return DockerClientBuilder.getInstance(config).build(); + DockerCmdExecFactory dockerClientFactory = new DockerCmdExecFactoryImpl(); + + return DockerClientBuilder.getInstance(config).withDockerCmdExecFactory(dockerClientFactory).build(); } http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientProfile.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientProfile.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientProfile.java index f56310f..62bf42e 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientProfile.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerClientProfile.java @@ -35,6 +35,7 @@ public class DockerClientProfile { private String serverAddress; private Integer requestTimeout; private boolean secure; + private String certPath; public String getHost() { return host; @@ -72,7 +73,7 @@ public class DockerClientProfile { public void setServerAddress(String serverAddress) { this.serverAddress = serverAddress; } - + public Integer getRequestTimeout() { return requestTimeout; } @@ -85,10 +86,16 @@ public class DockerClientProfile { public void setSecure(boolean secure) { this.secure = secure; } + public String getCertPath() { + return certPath; + } + public void setCertPath(String certPath) { + this.certPath = certPath; + } public String toUrl() throws DockerException { ObjectHelper.notNull(this.host, "host"); ObjectHelper.notNull(this.port, "port"); - + URL uri; String secure = this.secure ? "https" : "http"; try { @@ -98,12 +105,14 @@ public class DockerClientProfile { } return uri.toString(); - + } + @Override public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((certPath == null) ? 0 : certPath.hashCode()); result = prime * result + ((email == null) ? 0 : email.hashCode()); result = prime * result + ((host == null) ? 0 : host.hashCode()); result = prime * result + ((password == null) ? 0 : password.hashCode()); @@ -114,6 +123,7 @@ public class DockerClientProfile { result = prime * result + ((username == null) ? 0 : username.hashCode()); return result; } + @Override public boolean equals(Object obj) { if (this == obj) { @@ -126,6 +136,13 @@ public class DockerClientProfile { return false; } DockerClientProfile other = (DockerClientProfile)obj; + if (certPath == null) { + if (other.certPath != null) { + return false; + } + } else if (!certPath.equals(other.certPath)) { + return false; + } if (email == null) { if (other.email != null) { return false; @@ -180,5 +197,5 @@ public class DockerClientProfile { } return true; } - + } http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java index ae992dc..299324e 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java @@ -31,7 +31,7 @@ public class DockerConfiguration { private Map<DockerClientProfile, DockerClient> clients = new HashMap<DockerClientProfile, DockerClient>(); private DockerOperation operation; - + public void setClient(DockerClientProfile clientProfile, DockerClient client) { clients.put(clientProfile, client); } http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java index 91d15e8..6ade1d0 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConstants.java @@ -23,7 +23,7 @@ import java.util.Map; * Docker Component constants */ public final class DockerConstants { - + public static final String DOCKER_PREFIX = "CamelDocker"; public static final Map<String, Class<?>> DOCKER_DEFAULT_PARAMETERS = new HashMap<String, Class<?>>(); @@ -34,6 +34,7 @@ public final class DockerConstants { public static final String DOCKER_PORT = "CamelDockerPort"; public static final String DOCKER_SECURE = "CamelDockerSecure"; public static final String DOCKER_API_REQUEST_TIMEOUT = "CamelDockerRequestTimeout"; + public static final String DOCKER_CERT_PATH = "CamelDockerCertPath"; /** List Images **/ @@ -160,6 +161,7 @@ public final class DockerConstants { DOCKER_DEFAULT_PARAMETERS.put(DOCKER_EMAIL, String.class); DOCKER_DEFAULT_PARAMETERS.put(DOCKER_SERVER_ADDRESS, String.class); DOCKER_DEFAULT_PARAMETERS.put(DOCKER_SECURE, Boolean.class); + DOCKER_DEFAULT_PARAMETERS.put(DOCKER_CERT_PATH, String.class); } private DockerConstants() { http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java index 95e78ad..7d7cef0 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerHelper.java @@ -72,7 +72,6 @@ public final class DockerHelper { } else if (Boolean.class == parameterClass) { BooleanUtils.toBooleanObject((String)parameterValue, "true", "false", "null"); } - } catch (Exception e) { throw new DockerClientException("Failed to validate parameter type for property " + key); } @@ -173,16 +172,16 @@ public final class DockerHelper { if (message != null) { Object header = message.getHeader(name); - + if (header != null) { if (header.getClass().isAssignableFrom(clazz)) { - + T[] headerArray = (T[])Array.newInstance(clazz, 1); headerArray[0] = (T)header; return headerArray; } - + if (header.getClass().isArray()) { if (header.getClass().getDeclaringClass().isAssignableFrom(clazz)) { return (T[])header; @@ -219,15 +218,15 @@ public final class DockerHelper { public static String[] parseDelimitedStringHeader(String headerName, Message message) { Object header = message.getHeader(headerName); - + if (header != null) { - + if (header instanceof String) { - return ((String)header).split(STRING_DELIMITER); + return ((String) header).split(STRING_DELIMITER); } - + if (header instanceof String[]) { - return (String[])header; + return (String[]) header; } } http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java index d20a6d9..ea255f6 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerEventsConsumer.java @@ -131,7 +131,6 @@ public class DockerEventsConsumer extends DefaultConsumer implements EventCallba @Override public void onException(Throwable throwable) { LOGGER.error("Error Consuming from Docker Events: {}", throwable.getMessage()); - } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java index e63c073..f946de5 100644 --- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java +++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/producer/DockerProducer.java @@ -97,8 +97,8 @@ public class DockerProducer extends DefaultProducer { DockerOperation operation = configuration.getOperation(); - switch (operation) { - + switch(operation) { + case AUTH: dockerCmd = executeAuthRequest(client, message); break; @@ -155,19 +155,19 @@ public class DockerProducer extends DefaultProducer { break; case DIFF_CONTAINER: dockerCmd = executeDiffContainerRequest(client, message); - break; + break; case STOP_CONTAINER: dockerCmd = executeStopContainerRequest(client, message); - break; + break; case KILL_CONTAINER: dockerCmd = executeKillContainerRequest(client, message); - break; + break; case RESTART_CONTAINER: dockerCmd = executeRestartContainerRequest(client, message); - break; + break; case TOP_CONTAINER: dockerCmd = executeTopContainerRequest(client, message); - break; + break; case TAG_IMAGE: dockerCmd = executeTagImageRequest(client, message); break; http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java index 0aa0b56..560b0bb 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerClientProfileTest.java @@ -33,6 +33,7 @@ public class DockerClientProfileTest { Integer port = 2241; Integer requestTimeout = 40; boolean secure = true; + String certPath = "/docker/cert/path"; DockerClientProfile clientProfile1 = new DockerClientProfile(); @@ -43,6 +44,7 @@ public class DockerClientProfileTest { clientProfile1.setPort(port); clientProfile1.setRequestTimeout(requestTimeout); clientProfile1.setSecure(secure); + clientProfile1.setCertPath(certPath); DockerClientProfile clientProfile2 = new DockerClientProfile(); clientProfile2.setHost(host); @@ -52,6 +54,7 @@ public class DockerClientProfileTest { clientProfile2.setPort(port); clientProfile2.setRequestTimeout(requestTimeout); clientProfile2.setSecure(secure); + clientProfile2.setCertPath(certPath); assertEquals(clientProfile1, clientProfile2); } http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java index 7cdba03..30e42ae 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/DockerConfigurationTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.docker; - import java.util.HashMap; import java.util.Map; @@ -24,6 +23,8 @@ import org.apache.camel.Message; import org.apache.camel.impl.DefaultMessage; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; + import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java index 38c9a02..9c51abc 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/RemoveImageCmdUriTest.java @@ -45,12 +45,14 @@ public class RemoveImageCmdUriTest extends BaseDockerHeaderTest<RemoveImageCmd> @Override public void configure() throws Exception { from("direct:in").to("docker://" + getOperation().toString() + "?imageId=" + imageId + "&noPrune=" + noPrune + "&force=" + force); + } }; } @Test public void removeImageHeaderTest() { + Map<String, Object> headers = getDefaultParameters(); template.sendBodyAndHeaders("direct:in", "", headers); @@ -58,6 +60,7 @@ public class RemoveImageCmdUriTest extends BaseDockerHeaderTest<RemoveImageCmd> Mockito.verify(dockerClient, Mockito.times(1)).removeImageCmd(imageId); Mockito.verify(mockObject, Mockito.times(0)).withNoPrune(); Mockito.verify(mockObject, Mockito.times(1)).withForce(); + } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java index aba925c..dc6c381 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/AuthCmdHeaderTest.java @@ -66,15 +66,13 @@ public class AuthCmdHeaderTest extends BaseDockerHeaderTest<AuthCmd> { clientProfile.setPassword(password); clientProfile.setUsername(userName); clientProfile.setServerAddress(serverAddress); - + return clientProfile; - } @Override protected void setupMocks() { Mockito.when(dockerClient.authCmd()).thenReturn(mockObject); - } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java index 5f152ad..faf64cf 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/BuildImageCmdHeaderTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.component.docker.headers; + import java.io.File; import java.io.InputStream; import java.util.Map; http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java index 1628281..aee158a 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PingCmdHeaderTest.java @@ -35,9 +35,8 @@ public class PingCmdHeaderTest extends BaseDockerHeaderTest<PingCmd> { @Test public void pingHeaderTest() { - - Map<String, Object> headers = getDefaultParameters(); + Map<String, Object> headers = getDefaultParameters(); template.sendBodyAndHeaders("direct:in", "", headers); Mockito.verify(dockerClient, Mockito.times(1)).pingCmd(); http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java index 1a5cadd..8894603 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/PushImageCmdHeaderTest.java @@ -77,9 +77,9 @@ public class PushImageCmdHeaderTest extends BaseDockerHeaderTest<PushImageCmd> { clientProfile.setPassword(password); clientProfile.setUsername(userName); clientProfile.setServerAddress(serverAddress); - + return clientProfile; - + } http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java index f3d071b..e714353 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/headers/StopContainerCmdHeaderTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.docker.headers; - import java.util.Map; import com.github.dockerjava.api.command.StopContainerCmd; http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java ---------------------------------------------------------------------- diff --git a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java index 6139e76..860c56d 100644 --- a/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java +++ b/components/camel-docker/src/test/java/org/apache/camel/component/docker/it/DockerProducerTestIT.java @@ -30,14 +30,14 @@ public class DockerProducerTestIT extends CamelTestSupport { private String host = "192.168.59.103"; private String port = "2376"; - + @Test public void testDocker() throws Exception { template.sendBody("direct:in", ""); - + MockEndpoint mock = getMockEndpoint("mock:result"); - mock.expectedMinimumMessageCount(1); - + mock.expectedMinimumMessageCount(1); + assertMockEndpointsSatisfied(60, TimeUnit.SECONDS); } @@ -46,9 +46,9 @@ public class DockerProducerTestIT extends CamelTestSupport { return new RouteBuilder() { public void configure() { from("direct:in") - .to("docker://imagelist?host=" + host + "&port=" + port) + .to("docker://imagelist?host=" + host + "&port=" + port + "&certPath=/Users/ablock/.docker/boot2docker-vm&secure=true") .log("${body}") - .to("mock:result"); + .to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/d588ca1c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b0a4e15..c3131d9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -122,6 +122,7 @@ <disruptor-version>3.3.0</disruptor-version> <dnsjava-version>2.1.6</dnsjava-version> <dnsjava-bundle-version>2.1.6_1</dnsjava-bundle-version> + <docker-java-version>0.10.3</docker-java-version> <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version> <dozer-version>5.5.1</dozer-version> <drools-version>6.1.0.Final</drools-version> @@ -720,6 +721,11 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-docker</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-dozer</artifactId> <version>${project.version}</version> </dependency>
