You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/01/06 07:31:56 UTC
svn commit: r731844 - in /activemq/camel/trunk: camel-core/pom.xml
components/camel-osgi/pom.xml pom.xml
Author: ningjiang
Date: Mon Jan 5 22:31:55 2009
New Revision: 731844
URL: http://svn.apache.org/viewvc?rev=731844&view=rev
Log:
CAMEL-1228 Clean up the OSGI bundle profile
Modified:
activemq/camel/trunk/camel-core/pom.xml
activemq/camel/trunk/components/camel-osgi/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/pom.xml?rev=731844&r1=731843&r2=731844&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/pom.xml (original)
+++ activemq/camel/trunk/camel-core/pom.xml Mon Jan 5 22:31:55 2009
@@ -36,9 +36,14 @@
<description>The Core Camel POJO based router</description>
<properties>
- <camel.osgi.export.pkg>
- org.apache.camel.*
+ <camel.osgi.export.pkg>
+ org.apache.camel.*
</camel.osgi.export.pkg>
+ <camel.osgi.import>
+ !javax.xml.bind.annotation.adapters,
+ org.apache.xalan.xsltc.trax;resolution:=optional,
+ *
+ </camel.osgi.import>
</properties>
<repositories>
Modified: activemq/camel/trunk/components/camel-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/pom.xml?rev=731844&r1=731843&r2=731844&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-osgi/pom.xml (original)
+++ activemq/camel/trunk/components/camel-osgi/pom.xml Mon Jan 5 22:31:55 2009
@@ -35,6 +35,7 @@
<properties>
<camel.osgi.export.pkg>org.apache.camel.osgi.*</camel.osgi.export.pkg>
+ <camel.osgi.activator>org.apache.camel.osgi.Activator</camel.osgi.activator>
</properties>
<dependencies>
@@ -127,23 +128,7 @@
</resource>
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Export-Package>${camel.osgi.export.pkg}</Export-Package>
- <Import-Package>*</Import-Package>
- <Bundle-Activator>org.apache.camel.osgi.Activator</Bundle-Activator>
- <Implementation-Title>Apache Camel</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- </instructions>
- <unpackBundle>true</unpackBundle>
- </configuration>
- </plugin>
-
- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=731844&r1=731843&r2=731844&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Mon Jan 5 22:31:55 2009
@@ -90,6 +90,7 @@
<!-- OSGi bundles properties -->
<camel.osgi.import.pkg>!javax.xml.bind.annotation.adapters,*</camel.osgi.import.pkg>
+ <camel.osgi.activator></camel.osgi.activator>
<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>
@@ -1112,6 +1113,7 @@
<instructions>
<Bundle-Name>${artifactId}</Bundle-Name>
<Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
<Export-Package>${camel.osgi.export}</Export-Package>
<Import-Package>${camel.osgi.import}</Import-Package>
<Private-Package>${camel.osgi.private.pkg}</Private-Package>