Author: ningjiang
Date: Tue Aug 9 11:51:39 2011
New Revision: 1155322
URL: http://svn.apache.org/viewvc?rev=1155322&view=rev
Log:
Merged revisions 1155229 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1155229 | ningjiang | 2011-08-09 14:55:10 +0800 (Tue, 09 Aug 2011) | 1 line
CAMEL-4316 camel-cxf bundle should not ship the camel-cxf-transport packages
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 9 11:51:39 2011
@@ -1 +1 @@
-/camel/trunk:1-1148091,1149488,1153146,1153323
+/camel/trunk:1-1148091,1149488,1153146,1153323,1155229
Modified: camel/branches/camel-2.8.x/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/pom.xml?rev=1155322&r1=1155321&r2=1155322&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/pom.xml Tue Aug 9 11:51:39
2011
@@ -33,8 +33,15 @@
<properties>
<camel.osgi.import>
- !org.apache.camel.component.cxf.*,
- !META-INF.cxf.camel,
+ !org.apache.camel.component.cxf,
+ !org.apache.camel.component.cxf.blueprint,
+ !org.apache.camel.component.cxf.converter,
+ !org.apache.camel.component.cxf.cxfbean,
+ !org.apache.camel.component.cxf.feature,
+ !org.apache.camel.component.cxf.interceptors,
+ !org.apache.camel.component.cxf.jaxrs,
+ !org.apache.camel.component.cxf.spring,
+ !org.apache.camel.component.cxf.util,
javax.activation*;version="[0.0,2)",
javax.annotation*;version="[0.0,2)",
javax.jws*;version="[0.0,3)",
@@ -56,7 +63,15 @@
</camel.osgi.import>
<camel.osgi.export>
-
org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first
+ org.apache.camel.component.cxf;${camel.osgi.version},
+ org.apache.camel.component.cxf.blueprint;${camel.osgi.version},
+ org.apache.camel.component.cxf.converter;${camel.osgi.version},
+ org.apache.camel.component.cxf.cxfbean;${camel.osgi.version},
+ org.apache.camel.component.cxf.feature;${camel.osgi.version},
+ org.apache.camel.component.cxf.interceptors;${camel.osgi.version},
+ org.apache.camel.component.cxf.jaxrs;${camel.osgi.version},
+ org.apache.camel.component.cxf.spring;${camel.osgi.version},
+ org.apache.camel.component.cxf.util;${camel.osgi.version}
</camel.osgi.export>
<camel.osgi.failok>true</camel.osgi.failok>
