Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/activemq/browse/AMQ-2570 - activemq karaf - features update 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@900850 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2010-01-19 17:20:59 +00:00
parent 27a6f1c6ab
commit e5d134d4c0
5 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
activemq-console/pom.xml
View File

@ -36,6 +36,7 @@
org.springframework*;resolution:=optional,
sun.management*;resolution:=optional,
org.josql*;resolution:=optional,
org.apache.velocity*;resolution:=optional,
*
</activemq.osgi.import.pkg>
<activemq.osgi.export>
@ -97,13 +98,18 @@
</dependency>
<dependency>
<groupId>velocity</groupId>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang-version}</version>
</dependency>
<dependency>
<groupId>net.sf.josql</groupId>
<artifactId>josql</artifactId>

27
activemq-karaf/src/main/resources/features.xml
View File

@ -4,7 +4,7 @@
<feature name="transaction" version="1.0.0">
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/1.0.1-1_1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/1.0.1-1_1</bundle>
<bundle>mvn:org.apache.geronimo.components/geronimo-transaction/2.2-r634076</bundle>
<bundle>mvn:org.springframework/spring-tx/2.5.6</bundle>
<bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/1.0.0</bundle>
@ -17,16 +17,23 @@
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jencks/2.1_1</bundle>
</feature>
<feature name="activemq" version="5.3.0">
<feature version="4.0.0">connector</feature>
<feature name="activemq" version="${activemq-version}">
<feature version="4.0.0">connector</feature>
<config name="org.apache.servicemix.transaction">
transactionLogDir = data/txlog/
</config>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
<bundle>mvn:commons-pool/commons-pool/1.4</bundle>
<bundle>mvn:org.apache.xbean/xbean-spring/3.6</bundle>
<bundle>mvn:org.apache.activemq/activemq-core/5.3.0</bundle>
<bundle>mvn:org.apache.activemq/kahadb/5.3.0</bundle>
<bundle>mvn:org.apache.activemq/activemq-ra/5.3.0</bundle>
<bundle>mvn:org.apache.activemq/activemq-console/5.3.0</bundle>
<bundle>mvn:org.apache.activemq/activemq-pool/5.3.0</bundle>
<bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-ra/${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>
</feature>
</features>

2
activemq-optional/pom.xml
View File

@ -173,7 +173,7 @@
</dependency>
<dependency>
<groupId>velocity</groupId>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>

3
assembly/src/main/descriptors/common-bin.xml
View File

@ -202,6 +202,7 @@
<include>commons-pool:commons-pool</include>
<include>commons-codec:commons-codec</include>
<include>commons-net:commons-net</include>
<include>commons-lang:commons-lang</include>
<include>log4j:log4j</include>
<include>mx4j:mx4j-remote</include>
<include>mx4j:mx4j-tools</include>
@ -221,7 +222,7 @@
<include>org.codehaus.woodstox:wstx-asl</include>
<include>org.springframework.ws:spring-oxm-tiger</include>
<include>org.codehaus.jettison:jettison</include>
<include>velocity:velocity</include>
<include>org.apache.velocity:velocity</include>
<include>net.sf.josql:josql</include>
</includes>
</dependencySet>

6
pom.xml
View File

@ -51,6 +51,7 @@
<commons-dbcp-version>1.2.2</commons-dbcp-version>
<commons-httpclient-version>3.1</commons-httpclient-version>
<commons-io-version>1.4</commons-io-version>
<commons-lang-version>2.4</commons-lang-version>
<commons-logging-version>1.1</commons-logging-version>
<commons-pool-version>1.4</commons-pool-version>
<commons-primitives-version>1.0</commons-primitives-version>
@ -78,6 +79,7 @@
<xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
<xstream-version>1.3.1</xstream-version>
<xbean-version>3.6</xbean-version>
<velocity-version>1.6.2</velocity-version>
<felix-version>2.0.1</felix-version>
<commons-net-version>2.0</commons-net-version>
<ftpserver-version>1.0.0</ftpserver-version>
@ -890,9 +892,9 @@
</dependency>
<dependency>
<groupId>velocity</groupId>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<version>${velocity-version}</version>
<optional>true</optional>
</dependency>
<dependency>