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/05 18:04:29 UTC
svn commit: r960631 - in /activemq/trunk:
activemq-karaf/src/main/resources/features.xml activemq-web-console/pom.xml
activemq-web/pom.xml
Author: dejanb
Date: Mon Jul 5 16:04:29 2010
New Revision: 960631
URL: http://svn.apache.org/viewvc?rev=960631&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2570 - osgifying web console
Modified:
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/activemq-web-console/pom.xml
activemq/trunk/activemq-web/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=960631&r1=960630&r2=960631&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Mon Jul 5 16:04:29 2010
@@ -60,6 +60,10 @@
<!-- 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>
<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=960631&r1=960630&r2=960631&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Mon Jul 5 16:04:29 2010
@@ -130,7 +130,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,javax.xml.parsers,javax.xml.transform,javax.naming,org.w3c.dom,org.apache.activemq,org.apache.activemq.util,org.apache.activemq.xbean,org.apache.activemq*,!org.apache.activemq.web*,!org.springframework*,*</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,org.apache.activemq,org.apache.activemq.util,org.apache.activemq.xbean,org.apache.activemq*,org.springframework*,org.springframework.context.support,org.springframework.beans.factory.config,org.springframework.core.io,org.springframework.beans.factory,javax.servlet.jsp,javax.servlet.jsp.tagext,*</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: activemq/trunk/activemq-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/pom.xml?rev=960631&r1=960630&r2=960631&view=diff
==============================================================================
--- activemq/trunk/activemq-web/pom.xml (original)
+++ activemq/trunk/activemq-web/pom.xml Mon Jul 5 16:04:29 2010
@@ -33,8 +33,11 @@
<properties>
<activemq.osgi.import.pkg>
org.apache.activemq*;resolution:=optional,
+ org.apache.camel*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional,
org.springframework*;resolution:=optional,
- sun.management*;resolution:=optional,
+ com.thoughtworks.xstream*;resolution:=optional,
+ com.sun*;resolution:=optional,
*
</activemq.osgi.import.pkg>
<activemq.osgi.export>