activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1436379 - in /activemq/trunk: activemq-osgi/pom.xml activemq-spring/pom.xml
Date Mon, 21 Jan 2013 14:43:57 GMT
Author: dejanb
Date: Mon Jan 21 14:43:57 2013
New Revision: 1436379

URL: http://svn.apache.org/viewvc?rev=1436379&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4034 - adding dependency resources to the osgi jar

Modified:
    activemq/trunk/activemq-osgi/pom.xml
    activemq/trunk/activemq-spring/pom.xml

Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1436379&r1=1436378&r2=1436379&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Mon Jan 21 14:43:57 2013
@@ -35,8 +35,7 @@
 
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>
-      org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first,
-      '=META-INF.services.org.apache.xbean.spring.http.activemq.apache.org.schema';-noimport:=true
+      org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first
     </activemq.osgi.export>
     <activemq.osgi.dynamic.import>*</activemq.osgi.dynamic.import>
     <surefire.argLine>-Xmx512M</surefire.argLine>
@@ -165,6 +164,8 @@
         <configuration>
           <instructions>
             <!-- <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
-->
+             <Embed-Dependency>*;groupId=org.apache.activemq;inline=META-INF/services/*</Embed-Dependency>
+             <Embed-Transitive>true</Embed-Transitive>
           </instructions>
         </configuration>
       </plugin>

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1436379&r1=1436378&r2=1436379&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Mon Jan 21 14:43:57 2013
@@ -26,7 +26,6 @@
   </parent>
 
   <artifactId>activemq-spring</artifactId>
-  <packaging>bundle</packaging>
   <name>ActiveMQ :: Spring</name>
   <description>ActiveMQ Spring Integration</description>
 



Mime
View raw message