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/06/06 10:53:54 UTC
[1/4] git commit: CAMEL-6431: Added features for camel-geocoder
Updated Branches:
refs/heads/camel-2.11.x cb4d82de1 -> 9a82d0b2e
refs/heads/master 5a259c529 -> 4a2dd39db
CAMEL-6431: Added features for camel-geocoder
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4bf4969a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bf4969a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bf4969a
Branch: refs/heads/master
Commit: 4bf4969a12b72646108d89ea0aa46aa7775e7e4f
Parents: 5a259c5
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 6 08:11:45 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 6 08:11:45 2013 +0200
----------------------------------------------------------------------
.../karaf/features/src/main/resources/features.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4bf4969a/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 7a378e2..d10a094 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -295,6 +295,14 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.gae/${google-app-engine-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-gae/${project.version}</bundle>
</feature>
+ <feature name='camel-geocoder' 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.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.google.code.geocoder-java/geocoder-java/${geocoder-java-version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-geocoder/${project.version}</bundle>
+ </feature>
<feature name='camel-groovy' 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.ant/${ant-bundle-version}</bundle>
@@ -748,7 +756,7 @@
<bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.eclipse.jetty/jetty-util/${jetty-version}</bundle>
- <bundle dependency='true'>mvn:org.eclipse.jetty/jetty-io/${jetty--version}</bundle>
+ <bundle dependency='true'>mvn:org.eclipse.jetty/jetty-io/${jetty-version}</bundle>
<bundle dependency='true'>mvn:org.eclipse.jetty/jetty-http/${jetty-version}</bundle>
<bundle dependency='true'>mvn:org.eclipse.jetty/jetty-client/${jetty-version}</bundle>
<bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
[2/4] git commit: CAMEL-6247: javax.jmx osig import range should
include JMS 2.0 API. Thanks to Thomas Diesler for patches.
Posted by da...@apache.org.
CAMEL-6247: javax.jmx osig import range should include JMS 2.0 API. Thanks to Thomas Diesler for patches.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/169ed90c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/169ed90c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/169ed90c
Branch: refs/heads/master
Commit: 169ed90c459accb732b6ee0fb3fbe3725973ddbf
Parents: 4bf4969
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 6 10:52:57 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 6 10:52:57 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/169ed90c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e04d4ec..a48a713 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -434,7 +434,6 @@
net.sf.saxon.*;version="[9.3.0,9.6)",
freemarker.*;version="[2.3.15,3)",
javax.persistence.*;version="[1.1,3)",
- javax.jms;version="[1.1,3)"
</camel.osgi.import.defaults>
<camel.osgi.import.before.defaults />
<camel.osgi.import.additional />
[4/4] git commit: CAMEL-6247: javax.jmx osig import range should
include JMS 2.0 API. Thanks to Thomas Diesler for patches.
Posted by da...@apache.org.
CAMEL-6247: javax.jmx osig import range should include JMS 2.0 API. Thanks to Thomas Diesler for patches.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a82d0b2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a82d0b2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a82d0b2
Branch: refs/heads/camel-2.11.x
Commit: 9a82d0b2ec53be30d795b9fbdde11b070b621417
Parents: cb4d82d
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 6 10:52:57 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 6 10:53:38 2013 +0200
----------------------------------------------------------------------
parent/pom.xml | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9a82d0b2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 74fe119..d44a16f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -435,7 +435,6 @@
net.sf.saxon.*;version="[9.3.0,9.5)",
freemarker.*;version="[2.3.15,3)",
javax.persistence.*;version="[1.1,3)",
- javax.jms;version="[1.1,3)"
</camel.osgi.import.defaults>
<camel.osgi.import.before.defaults />
<camel.osgi.import.additional />
[3/4] git commit: Fixed features.xml
Posted by da...@apache.org.
Fixed features.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a2dd39d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a2dd39d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a2dd39d
Branch: refs/heads/master
Commit: 4a2dd39db63ace6d6f0225c72c6a5fcf46c26fcf
Parents: 169ed90
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 6 10:53:09 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 6 10:53:09 2013 +0200
----------------------------------------------------------------------
.../karaf/features/src/main/resources/features.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4a2dd39d/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 d10a094..cf30660 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -218,11 +218,13 @@
<bundle>mvn:org.apache.camel/camel-cxf-transport/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-cxf/${project.version}</bundle>
</feature>
+<!-- TODO: Does not work due: No export found to match sun.misc (imported by mvn:com.lmax/disruptor/3.0.1)
<feature name='camel-disruptor' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:com.lmax/disruptor/${disruptor-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-disruptor/${project.version}</bundle>
</feature>
+-->
<feature name='camel-dns' version='${project.version}' resolver='(obr)' start-level='50'>
<details>The camel-dns feature can only run on a SUN JVM. You need to ddd the package sun.net.spi.nameservice to the java platform packages in the etc/jre.properties file.</details>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dnsjava/${dnsjava-bundle-version}</bundle>
@@ -298,6 +300,7 @@
<feature name='camel-geocoder' 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.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
<bundle dependency='true'>wrap:mvn:com.google.code.geocoder-java/geocoder-java/${geocoder-java-version}</bundle>
@@ -752,6 +755,7 @@
<bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo-servlet-spec-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-client/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/bayeux-api/${cometd-java-client-version}</bundle>
<bundle dependency='true'>mvn:org.cometd.java/cometd-java-common/${cometd-java-client-version}</bundle>