You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2013/06/20 13:29:43 UTC
svn commit: r1494934 - in /activemq/trunk:
activemq-karaf/src/main/resources/features.xml activemq-osgi/pom.xml
Author: dejanb
Date: Thu Jun 20 11:29:43 2013
New Revision: 1494934
URL: http://svn.apache.org/r1494934
Log:
fix some osgi regressions
Modified:
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/activemq-osgi/pom.xml
Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1494934&r1=1494933&r2=1494934&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Thu Jun 20 11:29:43 2013
@@ -66,6 +66,13 @@
-->
</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 -->
<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>
Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1494934&r1=1494933&r2=1494934&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Thu Jun 20 11:29:43 2013
@@ -54,6 +54,8 @@
org.eclipse.jetty*;resolution:=optional,
org.fusesource.fabric*;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.osgi*;version="[1.2,1.3]";resolution:=optional,
org.springframework.transaction*;version="[3,4]";resolution:=optional,