Author: ningjiang
Date: Tue Jan 6 17:17:25 2009
New Revision: 732190
URL: http://svn.apache.org/viewvc?rev=732190&view=rev
Log:
Merged revisions 731844 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r731844 | ningjiang | 2009-01-06 14:31:55 +0800 (Tue, 06 Jan 2009) | 1 line
CAMEL-1228 Clean up the OSGI bundle profile
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/pom.xml
activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml
activemq/camel/branches/camel-1.x/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 6 17:17:25 2009
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730069,730132,730154,730157,730275,730299,730504-730505,730508,730571,730599,730759,730903,730916,730923,730936,730992,731126,731168-731169,731488,731492,731799,731824,731836,731860
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351,725569-725572,725612,725652-725660,725715,725883,726339,726640-726645,726932,727113,727375,727377,727624,727713,727946,729401,729892,730069,730132,730154,730157,730275,730299,730504-730505,730508,730571,730599,730759,730903,730916,730923,730936,730992,731126,731168-731169,731488,731492,731799,731824,731836,731844,731860
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/camel-core/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/pom.xml?rev=732190&r1=732189&r2=732190&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/camel-core/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/camel-core/pom.xml Tue Jan 6 17:17:25
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/branches/camel-1.x/components/camel-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml?rev=732190&r1=732189&r2=732190&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-osgi/pom.xml Tue Jan 6
17:17:25 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/branches/camel-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/pom.xml?rev=732190&r1=732189&r2=732190&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/pom.xml Tue Jan 6 17:17:25 2009
@@ -88,6 +88,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>
@@ -1118,6 +1119,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>
