Author: davsclaus
Date: Wed Apr 13 14:30:08 2011
New Revision: 1091799
URL: http://svn.apache.org/viewvc?rev=1091799&view=rev
Log:
CAMEL-3858: Fixed osgi metadata for components exporting 2 pacakges or more.
Modified:
camel/trunk/components/camel-crypto/pom.xml
camel/trunk/components/camel-josql/pom.xml
camel/trunk/components/camel-lucene/pom.xml
camel/trunk/components/camel-msv/pom.xml
camel/trunk/components/camel-quartz/pom.xml
camel/trunk/components/camel-routebox/pom.xml
camel/trunk/components/camel-sql/pom.xml
Modified: camel/trunk/components/camel-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/pom.xml?rev=1091799&r1=1091798&r2=1091799&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/pom.xml (original)
+++ camel/trunk/components/camel-crypto/pom.xml Wed Apr 13 14:30:08 2011
@@ -33,9 +33,15 @@
<properties>
<camel.osgi.export.pkg>
- org.apache.camel.component.crypto.*,
+ org.apache.camel.component.crypto.*;${camel.osgi.version},
org.apache.camel.converter.crypto.*
</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.crypto.*,
+ !org.apache.camel.converter.crypto.*,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
</properties>
<dependencies>
Modified: camel/trunk/components/camel-josql/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-josql/pom.xml?rev=1091799&r1=1091798&r2=1091799&view=diff
==============================================================================
--- camel/trunk/components/camel-josql/pom.xml (original)
+++ camel/trunk/components/camel-josql/pom.xml Wed Apr 13 14:30:08 2011
@@ -33,9 +33,15 @@
<properties>
<camel.osgi.export.pkg>
- org.apache.camel.builder.sql.*,
+ org.apache.camel.builder.sql.*;${camel.osgi.version},
org.apache.camel.language.sql.*
</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.builder.sql.*,
+ !org.apache.camel.language.sql.*,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
</properties>
<repositories>
Modified: camel/trunk/components/camel-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/pom.xml?rev=1091799&r1=1091798&r2=1091799&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/pom.xml (original)
+++ camel/trunk/components/camel-lucene/pom.xml Wed Apr 13 14:30:08 2011
@@ -33,9 +33,15 @@
<properties>
<camel.osgi.export.pkg>
- org.apache.camel.component.lucene.*,
+
org.apache.camel.component.lucene.*;${camel.osgi.version},
org.apache.camel.processor.lucene.*
</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.lucene.*,
+ !org.apache.camel.processor.lucene.*,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
</properties>
<dependencies>
Modified: camel/trunk/components/camel-msv/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-msv/pom.xml?rev=1091799&r1=1091798&r2=1091799&view=diff
==============================================================================
--- camel/trunk/components/camel-msv/pom.xml (original)
+++ camel/trunk/components/camel-msv/pom.xml Wed Apr 13 14:30:08 2011
@@ -32,7 +32,6 @@
<description>Camel MSV support</description>
<properties>
- <camel.osgi.import.pkg>org.apache.camel,*</camel.osgi.import.pkg>
<camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
</properties>
Modified: camel/trunk/components/camel-quartz/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/pom.xml?rev=1091799&r1=1091798&r2=1091799&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/pom.xml (original)
+++ camel/trunk/components/camel-quartz/pom.xml Wed Apr 13 14:30:08 2011
@@ -36,6 +36,12 @@
org.apache.camel.component.quartz.*;${camel.osgi.version},
org.apache.camel.routepolicy.quartz.*
</camel.osgi.export.pkg>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.quartz.*,
+ !org.apache.camel.routepolicy.quartz.*,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
</properties>
<dependencies>
Modified: camel/trunk/components/camel-routebox/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/pom.xml?rev=1091799&r1=1091798&r2=1091799&view=diff
==============================================================================
--- camel/trunk/components/camel-routebox/pom.xml (original)
+++ camel/trunk/components/camel-routebox/pom.xml Wed Apr 13 14:30:08 2011
@@ -33,10 +33,16 @@
<properties>
<camel.osgi.export.pkg>
- org.apache.camel.component.routebox.*,
+ org.apache.camel.component.routebox.*;${camel.osgi.version},
org.apache.camel.component.routebox.seda.*
</camel.osgi.export.pkg>
- </properties>
+ <camel.osgi.import.pkg>
+ !org.apache.camel.component.routebox.*,
+ !org.apache.camel.routepolicy.routebox.seda.*,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import.pkg>
+ </properties>
<dependencies>
<dependency>
Modified: camel/trunk/components/camel-sql/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/pom.xml?rev=1091799&r1=1091798&r2=1091799&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/pom.xml (original)
+++ camel/trunk/components/camel-sql/pom.xml Wed Apr 13 14:30:08 2011
@@ -39,6 +39,7 @@
!org.apache.camel.component.sql.*,
!org.apache.camel.processor.aggregate.jdbc.*,
!org.apache.camel.processor.idempotent.jdbc.*,
+ ${camel.osgi.import.defaults},
*
</camel.osgi.import.pkg>
</properties>
