Author: hadrian
Date: Thu Apr 7 16:11:24 2011
New Revision: 1089932
URL: http://svn.apache.org/viewvc?rev=1089932&view=rev
Log:
CAMEL-3836. Backport to camel-2.7.x
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-cache/pom.xml
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 16:11:24 2011
@@ -1 +1 @@
-/camel/trunk:1087856,1088583,1088916,1089275
+/camel/trunk:1087856,1088583,1088916-1088917,1089275
Modified: camel/branches/camel-2.7.x/components/camel-cache/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/components/camel-cache/pom.xml?rev=1089932&r1=1089931&r2=1089932&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/components/camel-cache/pom.xml (original)
+++ camel/branches/camel-2.7.x/components/camel-cache/pom.xml Thu Apr 7
16:11:24 2011
@@ -33,9 +33,14 @@
<description>Camel Cache support based on ehCache</description>
<properties>
+ <camel.osgi.import>
+ !org.apache.camel.component.cache.*,
+ !org.apache.camel.processor.cache.*,
+ *
+ </camel.osgi.import>
<camel.osgi.export.pkg>
- org.apache.camel.component.cache.*,
- org.apache.camel.processor.cache.*
+ org.apache.camel.component.cache.*;${camel.osgi.version},
+ org.apache.camel.processor.cache.*;${camel.osgi.version}
</camel.osgi.export.pkg>
</properties>
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 16:11:24 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1087856,1088583,1088916,1089275
+/camel/trunk/components/camel-http:917526,1087856,1088583,1088916-1088917,1089275
