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 2010/07/08 10:17:05 UTC
svn commit: r961622 - in /activemq/trunk:
activemq-karaf/src/main/resources/features.xml activemq-web-console/pom.xml
Author: dejanb
Date: Thu Jul 8 08:17:05 2010
New Revision: 961622
URL: http://svn.apache.org/viewvc?rev=961622&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2570 - karaf feature improvements
Modified:
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/activemq-web-console/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=961622&r1=961621&r2=961622&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Thu Jul 8 08:17:05 2010
@@ -1,10 +1,6 @@
<features name="activemq-${activemq-version}">
<repository>mvn:org.apache.felix.karaf/apache-felix-karaf/1.6.0/xml/features</repository>
- <feature name="transaction" version="1.0.0">
- <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/0.1-incubating</bundle>
- </feature>
-
<feature name="spring" version="${spring-version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_3</bundle>
<bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
@@ -40,7 +36,8 @@
<bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle>
- <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/4.1.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/4.2.0</bundle>
+ <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/0.1-incubating</bundle>
</feature>
<feature name="activemq-spring" version="${activemq-version}">
@@ -59,11 +56,7 @@
<!-- do "features:install war" before installing this one -->
<feature name="activemq-web-console" version="${activemq-version}">
- <feature version="${activemq-version}">activemq-spring</feature>
- <bundle>mvn:org.springframework/spring-web/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-webmvc/${spring-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-camel/${activemq-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-web/${activemq-version}</bundle>
+ <feature version="${activemq-version}">activemq-spring</feature>
<bundle>war:mvn:org.apache.activemq/activemq-web-console/${activemq-version}/war?Webapp-Context=activemq-web-console</bundle>
</feature>
</features>
\ No newline at end of file
Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=961622&r1=961621&r2=961622&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Thu Jul 8 08:17:05 2010
@@ -119,7 +119,7 @@
<Embed-Directory>WEB-INF/lib</Embed-Directory>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Import-Package>org.xml.sax,org.xml.sax.helpers,javax.xml.parsers,javax.xml.transform,javax.management.remote,javax.naming,org.w3c.dom,javax.servlet*,javax.servlet.jsp,javax.servlet.jsp.tagext,javax.management,javax.management.openmbean,javax.net</Import-Package>
+ <Import-Package>org.xml.sax,org.xml.sax.helpers,javax.xml.parsers,javax.xml.transform,javax.management.remote,javax.naming,org.w3c.dom,javax.servlet*,javax.servlet.jsp,javax.servlet.jsp.tagext,javax.servlet.jsp.el,javax.management,javax.management.openmbean,javax.net</Import-Package>
</instructions>
</configuration>
</plugin>