Author: hadrian
Date: Mon May 30 22:38:32 2011
New Revision: 1129416
URL: http://svn.apache.org/viewvc?rev=1129416&view=rev
Log:
CAMEL-3858. Port fixes to the 2.7.x branch
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/components/camel-http/ (props changed)
camel/branches/camel-2.7.x/components/camel-routebox/pom.xml
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:38:32 2011
@@ -1 +1 @@
-/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577
+/camel/trunk:1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1095405
Propchange: camel/branches/camel-2.7.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 30 22:38:32 2011
@@ -1 +1 @@
-/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577
+/camel/trunk/components/camel-http:917526,1083696,1087276,1087612,1087856,1088583,1088916-1088917,1089275,1090166,1091518,1091771,1091799,1092068,1092577,1092667,1095405
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=1129416&r1=1129415&r2=1129416&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:38:32 2011
@@ -33,15 +33,8 @@
<properties>
<camel.osgi.export.pkg>
- org.apache.camel.component.routebox.*;${camel.osgi.version},
- org.apache.camel.component.routebox.seda.*
+ org.apache.camel.component.routebox.*
</camel.osgi.export.pkg>
- <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>
