Repository: camel Updated Branches: refs/heads/master c09a757bc -> ea14af002
update karaf feature for CAMEL-7316 client-side websocket Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea14af00 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea14af00 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea14af00 Branch: refs/heads/master Commit: ea14af00280bd5007f7a031a208c12af3773efb4 Parents: c09a757 Author: Akitoshi Yoshida <[email protected]> Authored: Fri Mar 21 12:03:03 2014 +0100 Committer: Akitoshi Yoshida <[email protected]> Committed: Fri Mar 21 12:03:03 2014 +0100 ---------------------------------------------------------------------- components/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ea14af00/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index e37b6c9..271138f 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -187,6 +187,7 @@ <module>camel-vertx</module> <module>camel-weather</module> <module>camel-websocket</module> + <module>camel-ws</module> <module>camel-xmlbeans</module> <module>camel-xmljson</module> <module>camel-xmlrpc</module> http://git-wip-us.apache.org/repos/asf/camel/blob/ea14af00/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 526166e..0a18b37 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1187,6 +1187,12 @@ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/${geronimo-servlet-spec-version}</bundle> <bundle>mvn:org.apache.camel/camel-websocket/${project.version}</bundle> </feature> + <feature name='camel-ws' version='${project.version}' resolver='(obr)' start-level='50'> + <feature version='${project.version}'>camel-core</feature> + <bundle dependency='true'>mvn:com.ning/async-http-client/${ahc-version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty/${netty3-version}</bundle> + <bundle>mvn:org.apache.camel/camel-ws/${project.version}</bundle> + </feature> <feature name='camel-xmlbeans' version='${project.version}' resolver='(obr)' start-level='50'> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${xmlbeans-bundle-version}</bundle>
