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/01 16:54:08 UTC
svn commit: r959687 - in /activemq/trunk:
activemq-karaf/src/main/resources/features.xml activemq-web-console/pom.xml
activemq-web/pom.xml
Author: dejanb
Date: Thu Jul 1 14:54:08 2010
New Revision: 959687
URL: http://svn.apache.org/viewvc?rev=959687&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2570 - first stab at updating karaf features
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=959687&r1=959686&r2=959687&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Thu Jul 1 14:54:08 2010
@@ -1,22 +1,11 @@
<features>
<repository>mvn:org.apache.felix.karaf/apache-felix-karaf/1.6.0/xml/features</repository>
- <repository>mvn:org.ops4j.pax.web/features/0.7.2/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.springframework/spring-core/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
- <bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
</feature>
<feature name="activemq" version="${activemq-version}">
- <feature version="1.1.1">servlet-2.5</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
@@ -34,7 +23,6 @@
</feature>
<feature name="activemq-spring" version="${activemq-version}">
- <feature version="${spring-version}">spring</feature>
<feature version="1.2.0">spring-dm</feature>
<feature version="${activemq-version}">activemq</feature>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
@@ -48,9 +36,9 @@
<bundle>mvn:org.apache.activemq/activemq-blueprint/${activemq-version}</bundle>
</feature>
- <!-- do "features:install pax-web" before installing this one -->
+ <!-- do "features:install war" before installing this one -->
<feature name="activemq-web-console" version="${activemq-version}">
- <!-- <feature version="0.7.2">pax-web</feature> - it doesn't see 'war' protocol since they are installed as the same feature -->
+ <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=959687&r1=959686&r2=959687&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Thu Jul 1 14:54:08 2010
@@ -35,19 +35,28 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>2.1-beta-1</version>
<configuration>
- <warSourceExcludes>
+ <packagingExcludes>
WEB-INF/lib/activation*.jar,
WEB-INF/lib/activeio*.jar,
- WEB-INF/lib/activemq-console*.jar,
+ WEB-INF/lib/activemq-core*.jar,
+ WEB-INF/lib/activemq-pool*.jar
+ WEB-INF/lib/activemq-console*.jar
WEB-INF/lib/geronimo*.jar,
WEB-INF/lib/xml-apis*.jar,
WEB-INF/lib/xerces*.jar
- </warSourceExcludes>
- <!-- <archive>
+ WEB-INF/lib/jetty*.jar
+ WEB-INF/lib/servlet*.jar
+ </packagingExcludes>
+ <archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
- -->
+<!-- <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive> -->
</configuration>
</plugin>
<plugin>
@@ -98,7 +107,7 @@
<scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
- <!-- <plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<executions>
@@ -123,10 +132,10 @@
<Embed-Directory>WEB-INF/lib</Embed-Directory>
<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <Import-Package>*;resolution:=optional</Import-Package>
+ <Import-Package>org.apache.activemq,org.xml.sax,javax.xml.parsers,javax.xml.transform,javax.naming,org.w3c.dom,*;resolution:=optional</Import-Package>
</instructions>
</configuration>
- </plugin> -->
+ </plugin>
</plugins>
</build>
Modified: activemq/trunk/activemq-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/pom.xml?rev=959687&r1=959686&r2=959687&view=diff
==============================================================================
--- activemq/trunk/activemq-web/pom.xml (original)
+++ activemq/trunk/activemq-web/pom.xml Thu Jul 1 14:54:08 2010
@@ -30,6 +30,18 @@
<name>ActiveMQ :: Web</name>
<description>Web Connector for REST API and Streamlets support</description>
+ <properties>
+ <activemq.osgi.import.pkg>
+ org.apache.activemq*;resolution:=optional,
+ org.springframework*;resolution:=optional,
+ sun.management*;resolution:=optional,
+ *
+ </activemq.osgi.import.pkg>
+ <activemq.osgi.export>
+ org.apache.activemq.web*;version=${project.version};-noimport:=true,
+ </activemq.osgi.export>
+ </properties>
+
<dependencies>
<!-- activemq -->
<dependency>