You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2014/02/16 21:35:57 UTC
svn commit: r1568823 - in /servicemix/smx5/trunk/assemblies:
apache-servicemix-full/src/main/filtered-resources/etc/
apache-servicemix/src/main/filtered-resources/
apache-servicemix/src/main/filtered-resources/etc/
Author: gertv
Date: Sun Feb 16 20:35:57 2014
New Revision: 1568823
URL: http://svn.apache.org/r1568823
Log:
SM-2238: Remove overwritten activemq features from our own features.xml
Thanks to Krzysztof for the patch!
Modified:
servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1568823&r1=1568822&r2=1568823&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix-full/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Sun Feb 16 20:35:57 2014
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
#
# Comma separated list of features to install at startup
#
-featuresBoot=karaf-framework,config,activemq-broker,jaxrs-api,camel,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker-noweb,jaxrs-api,camel,camel-cxf,camel-blueprint,war
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1568823&r1=1568822&r2=1568823&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Sun Feb 16 20:35:57 2014
@@ -25,5 +25,5 @@ featuresRepositories=mvn:org.apache.kara
#
# Comma separated list of features to install at startup
#
-featuresBoot=karaf-framework,config,activemq-broker,jaxrs-api,camel,camel-cxf,camel-blueprint,war
+featuresBoot=karaf-framework,config,activemq-broker-noweb,jaxrs-api,camel,camel-cxf,camel-blueprint,war
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1568823&r1=1568822&r2=1568823&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml Sun Feb 16 20:35:57 2014
@@ -39,7 +39,7 @@
-
-->
<feature name="examples-activemq-camel-blueprint" version="${version}" resolver="(obr)">
- <feature version="${activemq.version}">activemq-broker</feature>
+ <feature version="${activemq.version}">activemq-broker-noweb</feature>
<feature version="${camel.version}">camel-jms</feature>
<feature version="${camel.version}">camel-blueprint</feature>
<bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${version}</bundle>
@@ -171,58 +171,8 @@
<bundle>mvn:org.apache.servicemix.examples/akka-camel/${version}</bundle>
</feature>
- <!-- Add a feature called 'activemq' because CXF seems to expect that instead of 'activemq-broker' -->
- <feature name="activemq" version="${activemq.version}">
- <feature version="${activemq.version}">activemq-broker</feature>
- </feature>
-
- <!-- Override activemq-client feature as a workaround to https://issues.apache.org/jira/browse/AMQ-4341 -->
- <feature name="activemq-client" version="${activemq.version}" resolver="(obr)" start-level="50">
- <bundle>mvn:org.apache.activemq/activemq-osgi/${activemq.version}</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-annotation.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo-j2ee-management.version}</bundle>
- <bundle dependency="true">mvn:commons-pool/commons-pool/${commons-pool.version}</bundle>
- <feature version="[3,4)">spring</feature>
- <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
- </feature>
-
- <!-- Override activemq-broker feature as a workaround to https://issues.apache.org/jira/browse/AMQ-4341 -->
- <feature name="activemq-broker" version="${activemq.version}" resolver="(obr)" start-level="50">
- <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo-j2ee-management.version}</bundle>
- <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
- <feature version="${activemq.version}">activemq-client</feature>
- <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
- <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
- <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle>
- <bundle dependency="true">mvn:joda-time/joda-time/${joda-time.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
- <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries.version}</bundle>
-
- <!-- Camel JMS is required to get ActiveMQ's Camel component started -->
- <feature version="${camel.version}">camel-jms</feature>
-
- <!-- the following 4 bundles is needed by activemq-console -->
- <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf/${hawtbuf.version}</bundle>
- <bundle dependency="true">mvn:org.fusesource.hawtbuf/hawtbuf-proto/${hawtbuf.version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson.version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson.version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-karaf/${activemq.version}</bundle>
- <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala.version}</bundle>
- <configfile finalname="/etc/activemq.xml">mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/activemq</configfile>
- <configfile finalname="/etc/org.apache.activemq.server-default.cfg">mvn:org.apache.activemq/activemq-karaf/${activemq.version}/cfg/activemq</configfile>
- </feature>
-
<feature name="jms-appender" version="${version}" resolver="(obr)" start-level="50">
- <feature version="${activemq.version}">activemq-broker</feature>
+ <feature version="${activemq.version}">activemq-broker-noweb</feature>
<bundle>mvn:org.apache.servicemix.logging/jms-appender/${version}</bundle>
</feature>