Author: davsclaus
Date: Tue Dec 14 12:16:04 2010
New Revision: 1049059
URL: http://svn.apache.org/viewvc?rev=1049059&view=rev
Log:
CAMEL-3376: Using SMX castor bundle. Thanks to Jean for patch.
Modified:
camel/trunk/components/camel-castor/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-castor/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-castor/pom.xml?rev=1049059&r1=1049058&r2=1049059&view=diff
==============================================================================
--- camel/trunk/components/camel-castor/pom.xml (original)
+++ camel/trunk/components/camel-castor/pom.xml Tue Dec 14 12:16:04 2010
@@ -34,7 +34,6 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.dataformat.castor.*</camel.osgi.export.pkg>
<camel.osgi.import.before.defaults>org.exolab.castor.*;version="[1.2.0,2)"</camel.osgi.import.before.defaults>
- <castor-version>1.3.1</castor-version>
</properties>
<dependencies>
@@ -42,16 +41,10 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.castor</groupId>
- <artifactId>castor-xml</artifactId>
- <version>${castor-version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.castor</groupId>
- <artifactId>castor-core</artifactId>
- <version>${castor-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.castor</artifactId>
</dependency>
<!-- testing -->
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1049059&r1=1049058&r2=1049059&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec 14 12:16:04 2010
@@ -40,6 +40,7 @@
<aries-blueprint-version>0.2-incubating</aries-blueprint-version>
<axiom-version>1.2.8</axiom-version>
<bouncycastle-version>140</bouncycastle-version>
+ <castor-bundle-version>1.3.1_1</castor-bundle-version>
<cometd-bayeux-version>6.1.11</cometd-bayeux-version>
<commons-codec>1.4</commons-codec>
<commons-csv>1.0-r706899_3</commons-csv>
@@ -1006,6 +1007,13 @@
<artifactId>guiceyfruit-core</artifactId>
<version>${guiceyfruit-version}</version>
</dependency>
+
+ <!-- optional castor dependencies -->
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.castor</artifactId>
+ <version>${castor-bundle-version}</version>
+ </dependency>
<!-- optional dozer dependencies -->
<dependency>
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1049059&r1=1049058&r2=1049059&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
Tue Dec 14 12:16:04 2010
@@ -130,7 +130,9 @@
</feature>
<feature name='camel-castor' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.codehaus.castor/com.springsource.org.castor/${spring-castor-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.regexp/${regexp-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-castor/${pom.version}</bundle>
</feature>
<feature name='camel-crypto' version='${pom.version}'>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1049059&r1=1049058&r2=1049059&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Dec 14 12:16:04 2010
@@ -133,7 +133,9 @@
</feature>
<feature name='camel-castor' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:http://repository.springsource.com/maven/bundles/external!org.codehaus.castor/com.springsource.org.castor/${spring-castor-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.regexp/${regexp-bundle-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.castor/${castor-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-castor/${pom.version}</bundle>
</feature>
<feature name='camel-crypto' version='${pom.version}'>
