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/01/19 18:21:00 UTC
svn commit: r900850 - in /activemq/trunk: activemq-console/pom.xml
activemq-karaf/src/main/resources/features.xml activemq-optional/pom.xml
assembly/src/main/descriptors/common-bin.xml pom.xml
Author: dejanb
Date: Tue Jan 19 17:20:59 2010
New Revision: 900850
URL: http://svn.apache.org/viewvc?rev=900850&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2570 - activemq karaf - features update
Modified:
activemq/trunk/activemq-console/pom.xml
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/activemq-optional/pom.xml
activemq/trunk/assembly/src/main/descriptors/common-bin.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/pom.xml?rev=900850&r1=900849&r2=900850&view=diff
==============================================================================
--- activemq/trunk/activemq-console/pom.xml (original)
+++ activemq/trunk/activemq-console/pom.xml Tue Jan 19 17:20:59 2010
@@ -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,7 +98,7 @@
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
@@ -105,6 +106,11 @@
<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>
</dependency>
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=900850&r1=900849&r2=900850&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Tue Jan 19 17:20:59 2010
@@ -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>
\ No newline at end of file
Modified: activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-optional/pom.xml?rev=900850&r1=900849&r2=900850&view=diff
==============================================================================
--- activemq/trunk/activemq-optional/pom.xml (original)
+++ activemq/trunk/activemq-optional/pom.xml Tue Jan 19 17:20:59 2010
@@ -173,7 +173,7 @@
</dependency>
<dependency>
- <groupId>velocity</groupId>
+ <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
Modified: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=900850&r1=900849&r2=900850&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Tue Jan 19 17:20:59 2010
@@ -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>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=900850&r1=900849&r2=900850&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Jan 19 17:20:59 2010
@@ -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>