You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/06/06 12:01:08 UTC
camel git commit: CAMEL-11256: Make camel-docker work on OSGi
Repository: camel
Updated Branches:
refs/heads/master 782624fe3 -> e2c48e4ba
CAMEL-11256: Make camel-docker work on OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e2c48e4b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e2c48e4b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e2c48e4b
Branch: refs/heads/master
Commit: e2c48e4ba8e7adbcdbf084d12baeebf26eec833e
Parents: 782624f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Jun 6 14:00:13 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Jun 6 14:00:13 2017 +0200
----------------------------------------------------------------------
components/camel-docker/pom.xml | 10 ++++++
.../src/main/docs/docker-component.adoc | 2 +-
.../component/docker/DockerConfiguration.java | 4 +--
parent/pom.xml | 3 +-
.../features/src/main/resources/features.xml | 34 ++++++++++++++++++--
.../DockerComponentConfiguration.java | 2 +-
.../camel/itest/karaf/CamelDockerTest.java | 3 +-
7 files changed, 48 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e2c48e4b/components/camel-docker/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml
index f1c07e2..7edaeed 100644
--- a/components/camel-docker/pom.xml
+++ b/components/camel-docker/pom.xml
@@ -51,6 +51,16 @@
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>${docker-java-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.glassfish.jersey.connectors</groupId>
+ <artifactId>jersey-apache-connector</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- need to avoid the snapshot dependency -->
http://git-wip-us.apache.org/repos/asf/camel/blob/e2c48e4b/components/camel-docker/src/main/docs/docker-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/main/docs/docker-component.adoc b/components/camel-docker/src/main/docs/docker-component.adoc
index 3a59a9d..82ae8d6 100644
--- a/components/camel-docker/src/main/docs/docker-component.adoc
+++ b/components/camel-docker/src/main/docs/docker-component.adoc
@@ -62,7 +62,7 @@ with the following path and query parameters:
| **bridgeErrorHandler** (consumer) | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN or ERROR level and ignored. | false | boolean
| **exceptionHandler** (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| **exchangePattern** (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern
-| **cmdExecFactory** (advanced) | The fully qualified class name of the DockerCmdExecFactory implementation to use | com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory | String
+| **cmdExecFactory** (advanced) | The fully qualified class name of the DockerCmdExecFactory implementation to use | com.github.dockerjava.netty.NettyDockerCmdExecFactory | String
| **followRedirectFilter** (advanced) | Whether to follow redirect filter | false | boolean
| **loggingFilter** (advanced) | Whether to use logging filter | false | boolean
| **maxPerRouteConnections** (advanced) | Maximum route connections | 100 | Integer
http://git-wip-us.apache.org/repos/asf/camel/blob/e2c48e4b/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 1adf0aa..9b92c0e 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
@@ -63,8 +63,8 @@ public class DockerConfiguration implements Cloneable {
private boolean tlsVerify;
@UriParam(label = "advanced", defaultValue = "true")
private boolean socket;
- @UriParam(label = "advanced", defaultValue = "com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory")
- private String cmdExecFactory = "com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory";
+ @UriParam(label = "advanced", defaultValue = "com.github.dockerjava.netty.NettyDockerCmdExecFactory")
+ private String cmdExecFactory = "com.github.dockerjava.netty.NettyDockerCmdExecFactory";
private Map<String, Object> parameters = new HashMap<String, Object>();
http://git-wip-us.apache.org/repos/asf/camel/blob/e2c48e4b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 41733f4..3de3e77 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,7 +176,8 @@
<disruptor-version>3.3.6</disruptor-version>
<dnsjava-version>2.1.8</dnsjava-version>
<dnsjava-bundle-version>2.1.8_1</dnsjava-bundle-version>
- <docker-java-version>3.0.9</docker-java-version>
+ <docker-java-version>3.0.10</docker-java-version>
+ <docker-java-bundle-version>3.0.10_1-SNAPSHOT</docker-java-bundle-version>
<dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
<dozer-version>6.0.0</dozer-version>
<drools-version>6.5.0.Final</drools-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/e2c48e4b/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 6d556d2..ec3356d 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -463,6 +463,37 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjava-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-dns/${project.version}</bundle>
</feature>
+ <feature name='camel-docker' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.docker-java/${docker-java-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/${servicemix-specs-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
+ <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
+ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
+ <bundle dependency='true'>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle-version}</bundle>
+ <bundle dependency='true'>mvn:org.bouncycastle/bcmail-jdk15on/${bouncycastle-version}</bundle>
+ <bundle dependency='true'>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:de.gesellix/unix-socket-factory/${unix-socket-factory-version}$Bundle-SymbolicName=de.gesellix.unix-socket-factory&Bundle-Version=${unix-socket-factory-bundle-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-docker/${project.version}</bundle>
+ </feature>
<feature name='camel-drill' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<feature version='${spring-version-range}'>spring-jdbc</feature>
@@ -1269,9 +1300,6 @@
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle>
<bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${metrics-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle>mvn:org.apache.camel/camel-metrics/${project.version}</bundle>
</feature>
<feature name='camel-mina' version='${project.version}' resolver='(obr)' start-level='50'>
http://git-wip-us.apache.org/repos/asf/camel/blob/e2c48e4b/platforms/spring-boot/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java
index ddd9e70..cc9b6df 100644
--- a/platforms/spring-boot/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConfiguration.java
@@ -136,7 +136,7 @@ public class DockerComponentConfiguration
* The fully qualified class name of the DockerCmdExecFactory
* implementation to use
*/
- private String cmdExecFactory = "com.github.dockerjava.jaxrs.JerseyDockerCmdExecFactory";
+ private String cmdExecFactory = "com.github.dockerjava.netty.NettyDockerCmdExecFactory";
public String getHost() {
return host;
http://git-wip-us.apache.org/repos/asf/camel/blob/e2c48e4b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
index 1724e4d..a0a972f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelDockerTest.java
@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore("camel-docker do not work in OSGi")
public class CamelDockerTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelDockerTest.class);
@@ -32,4 +31,4 @@ public class CamelDockerTest extends BaseKarafTest {
testComponent(COMPONENT);
}
-}
\ No newline at end of file
+}