You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/07/31 13:35:37 UTC
[3/3] git commit: CAMEL-6165: New camel-stomp component. Thanks to
Dejan Bosanac for the contribution.
CAMEL-6165: New camel-stomp component. Thanks to Dejan Bosanac for the contribution.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64675d49
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64675d49
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64675d49
Branch: refs/heads/master
Commit: 64675d495be6abbf4831e29abb2cd33a5d58b107
Parents: 2beac53
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 31 13:17:13 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 31 13:35:21 2013 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 4 ++++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
components/pom.xml | 1 +
parent/pom.xml | 5 +++++
.../karaf/features/src/main/resources/features.xml | 13 +++++++++++++
5 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/64675d49/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 6108f62..0680fab 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -556,6 +556,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-stomp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-stringtemplate</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/64675d49/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 6cfde8d..db31116 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -148,6 +148,7 @@
<include>org.apache.camel:camel-sql</include>
<include>org.apache.camel:camel-ssh</include>
<include>org.apache.camel:camel-stax</include>
+ <include>org.apache.camel:camel-stomp</include>
<include>org.apache.camel:camel-stream</include>
<include>org.apache.camel:camel-stringtemplate</include>
<include>org.apache.camel:camel-syslog</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/64675d49/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 3f5713d..f52e83f 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -167,6 +167,7 @@
<module>camel-sql</module>
<module>camel-ssh</module>
<module>camel-stax</module>
+ <module>camel-stomp</module>
<module>camel-stream</module>
<module>camel-stringtemplate</module>
<module>camel-syslog</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/64675d49/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ce8e05b..dce08e5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1113,6 +1113,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-stomp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-stringtemplate</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/64675d49/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 a42c69f..864aeef 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -95,6 +95,8 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro/${avro-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avro-ipc/${avro-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.commons/commons-compress/${commons-compress-version}</bundle>
+ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty/${jetty6-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-avro/${project.version}</bundle>
</feature>
<feature name='camel-aws' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -959,6 +961,17 @@
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-stream/${project.version}</bundle>
</feature>
+<!-- TODO: stompjms need a new release to fix bad OSGi MANIFEST.MF data
+ <feature name='camel-stomp' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
+ <bundle dependency='true'>mvn:org.fusesource.stompjms/stompjms-client/${stompjms-version}</bundle>
+ <bundle dependency='true'>mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf-version}</bundle>
+ <bundle dependency='true'>mvn:org.fusesource.hawtdispatch/hawtdispatch/${hawtdispatch-version}</bundle>
+ <bundle dependency='true'>mvn:org.fusesource.hawtdispatch/hawtdispatch-transport/${hawtdispatch-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-stomp/${project.version}</bundle>
+ </feature>
+-->
<feature name='camel-string-template' 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.antlr/${antlr-bundle-version}</bundle>