Author: hadrian
Date: Mon May 30 22:21:08 2011
New Revision: 1129405
URL: http://svn.apache.org/viewvc?rev=1129405&view=rev
Log:
CAMEL-3858. Port fix to camel-2.7.x
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-crypto/pom.xml
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/components/camel-josql/pom.xml
camel/branches/camel-2.7.x/components/camel-lucene/pom.xml
camel/branches/camel-2.7.x/components/camel-msv/pom.xml
camel/branches/camel-2.7.x/components/camel-quartz/pom.xml
camel/branches/camel-2.7.x/components/camel-routebox/pom.xml
camel/branches/camel-2.7.x/components/camel-sql/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:21:08 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799
Modified: camel/branches/camel-2.7.x/components/camel-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-crypto/pom.xml?rev=1129405&r1=1129404&r2=1129405&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-crypto/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-crypto/pom.xml Mon May 30
22:21: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>
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:21:08 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799
Modified: camel/branches/camel-2.7.x/components/camel-josql/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-josql/pom.xml?rev=1129405&r1=1129404&r2=1129405&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-josql/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-josql/pom.xml Mon May 30
22:21: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/branches/camel-2.7.x/components/camel-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-lucene/pom.xml?rev=1129405&r1=1129404&r2=1129405&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-lucene/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-lucene/pom.xml Mon May 30
22:21: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/branches/camel-2.7.x/components/camel-msv/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-msv/pom.xml?rev=1129405&r1=1129404&r2=1129405&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-msv/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-msv/pom.xml Mon May 30 22:21: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/branches/camel-2.7.x/components/camel-quartz/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-quartz/pom.xml?rev=1129405&r1=1129404&r2=1129405&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-quartz/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-quartz/pom.xml Mon May 30
22:21: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/branches/camel-2.7.x/components/camel-routebox/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-routebox/pom.xml?rev=1129405&r1=1129404&r2=1129405&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-routebox/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-routebox/pom.xml Mon May 30
22:21: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/branches/camel-2.7.x/components/camel-sql/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-sql/pom.xml?rev=1129405&r1=1129404&r2=1129405&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-sql/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-sql/pom.xml Mon May 30 22:21: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>
