Author: ningjiang
Date: Wed Nov 18 07:34:12 2009
New Revision: 881692
URL: http://svn.apache.org/viewvc?rev=881692&view=rev
Log:
CAMEL-2185 export the META-INF.cxf from camel-cxf bundle
Modified:
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/components/camel-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=881692&r1=881691&r2=881692&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Wed Nov 18 07:34:12 2009
@@ -31,9 +31,19 @@
<description>Camel CXF support</description>
<properties>
- <camel.osgi.export.pkg>
- org.apache.camel.component.cxf.*
- </camel.osgi.export.pkg>
+ <camel.osgi.import>
+ !org.apache.camel.component.cxf.*,
+ !META-INF.cxf,
+ org.apache.camel.*;${camel.osgi.import.camel.version},
+ ${camel.osgi.import.defaults},
+ ${camel.osgi.import.additional},
+ *
+ </camel.osgi.import>
+ <camel.osgi.export>
+
org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first,
+ '=META-INF.cxf'
+ </camel.osgi.export>
+ <camel.osgi.failok>true</camel.osgi.failok>
</properties>
<repositories>
@@ -236,7 +246,6 @@
</systemProperties>
</configuration>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=881692&r1=881691&r2=881692&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Nov 18 07:34:12 2009
@@ -135,6 +135,7 @@
*
</camel.osgi.import.pkg>
<camel.osgi.activator />
+ <camel.osgi.failok>false</camel.osgi.failok>
<camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
<camel.osgi.export>${camel.osgi.export.pkg};${camel.osgi.version}</camel.osgi.export>
<camel.osgi.version>version=${project.version}</camel.osgi.version>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=881692&r1=881691&r2=881692&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Wed Nov 18 07:34:12 2009
@@ -367,15 +367,16 @@
<instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
- <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
+ <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
<Export-Package>${camel.osgi.export}</Export-Package>
<Import-Package>${camel.osgi.import}</Import-Package>
<DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
<Private-Package>${camel.osgi.private.pkg}</Private-Package>
<Implementation-Title>Apache Camel</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
-
<_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
- </instructions>
+
<_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
+ <_failok>${camel.osgi.failok}</_failok>
+ </instructions>
</configuration>
</plugin>