Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some osgi regressions 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1494934 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-06-20 11:29:43 +00:00
parent 166ab43c90
commit afe2e3ca08
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
activemq-karaf/src/main/resources/features.xml
View File

@ -66,6 +66,13 @@
--> -->
</feature> </feature>
<!-- Starts the broker with default configuration -->
<feature name="activemq-broker-noweb" description="Full ActiveMQ broker with default configuration" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="${project.version}">activemq</feature>
<configfile finalname="/etc/activemq.xml">mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/activemq</configfile>
<configfile finalname="/etc/org.apache.activemq.server-default.cfg">mvn:org.apache.activemq/activemq-karaf/${project.version}/cfg/activemq</configfile>
</feature>
<!-- Starts the broker with default configuration and web console --> <!-- Starts the broker with default configuration and web console -->
<feature name="activemq-broker" description="Full ActiveMQ broker with default configuration and web console" version="${project.version}" resolver="(obr)" start-level="50"> <feature name="activemq-broker" description="Full ActiveMQ broker with default configuration and web console" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="${project.version}">activemq</feature> <feature version="${project.version}">activemq</feature>

2
activemq-osgi/pom.xml
View File

@ -54,6 +54,8 @@
org.eclipse.jetty*;resolution:=optional, org.eclipse.jetty*;resolution:=optional,
org.fusesource.fabric*;version="[7,8]";resolution:=optional, org.fusesource.fabric*;version="[7,8]";resolution:=optional,
org.fusesource.fabric.groups*;version="[7,8]";resolution:=optional, org.fusesource.fabric.groups*;version="[7,8]";resolution:=optional,
org.apache.zookeeper;resolution:=optional,
org.linkedin*;resolution:=optional,
org.springframework.jms*;version="[3,4]";resolution:=optional, org.springframework.jms*;version="[3,4]";resolution:=optional,
org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional, org.springframework.osgi*;version="[1.2,1.3]";resolution:=optional,
org.springframework.transaction*;version="[3,4]";resolution:=optional, org.springframework.transaction*;version="[3,4]";resolution:=optional,