Author: jbonofre
Date: Wed Oct 13 09:49:26 2010
New Revision: 1022051
URL: http://svn.apache.org/viewvc?rev=1022051&view=rev
Log:
[SMX4-594] Upgrade to ActiveMQ 5.4.1, overriding the features descriptor.
Added:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1022051&r1=1022050&r2=1022051&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Wed Oct 13 09:49:26 2010
@@ -215,12 +215,6 @@
<!-- ActiveMQ -->
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-karaf</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
<artifactId>activemq-blueprint</artifactId>
</dependency>
<dependency>
@@ -570,10 +564,6 @@
<artifactId>scriptengines-groovy</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
@@ -689,7 +679,7 @@
<descriptors>
<descriptor>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</descriptor>
-
<descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
+
<descriptor>file:${basedir}/target/classes/activemq-features.xml</descriptor>
<descriptor>file:${basedir}/target/classes/camel-features.xml</descriptor>
<descriptor>file:${basedir}/target/classes/ode-features.xml</descriptor>
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1022051&r1=1022050&r2=1022051&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
Wed Oct 13 09:49:26 2010
@@ -16,8 +16,7 @@
limitations under the License.
-->
<assembly>
- <id></id> <!-- intentionally left blank ->
http://jira.codehaus.org/browse/MASSEMBLY-301
--->
+ <id></id> <!-- intentionally left blank ->
http://jira.codehaus.org/browse/MASSEMBLY-301 -->
<formats>
<format>tar.gz</format>
</formats>
@@ -178,6 +177,13 @@
<lineEnding>unix</lineEnding>
</file>
<file>
+ <source>${basedir}/target/classes/activemq-features.xml</source>
+
<outputDirectory>system/org/apache/activemq/activemq-karaf/${activemq.version}</outputDirectory>
+
<destName>activemq-karaf-${activemq.version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
<source>${basedir}/target/classes/camel-features.xml</source>
<outputDirectory>system/org/apache/camel/karaf/apache-camel/${camel.version}</outputDirectory>
<destName>apache-camel-${camel.version}-features.xml</destName>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1022051&r1=1022050&r2=1022051&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
Wed Oct 13 09:49:26 2010
@@ -157,6 +157,13 @@
<lineEnding>dos</lineEnding>
</file>
<file>
+ <source>${basedir}/target/classes/activemq-features.xml</source>
+
<outputDirectory>system/org/apache/activemq/activemq-karaf/${activemq.version}</outputDirectory>
+
<destName>activemq-karaf-${activemq.version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
<source>${basedir}/target/classes/camel-features.xml</source>
<outputDirectory>system/org/apache/camel/karaf/apache-camel/${camel.version}</outputDirectory>
<destName>apache-camel-${camel.version}-features.xml</destName>
Added:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml?rev=1022051&view=auto
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
(added)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/activemq-features.xml
Wed Oct 13 09:49:26 2010
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<features name="activemq-${activemq.version}">
+
<repository>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</repository>
+
+ <feature name="activemq" version="${activemq.version}">
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/${geronimo-annotation.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms.version}</bundle>
+
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/${geronimo-j2ee-management.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-pool/${commons-pool.bundle.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.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-console/${activemq.version}</bundle>
+
<bundle>mvn:org.apache.activemq/activemq-ra/${activemq.version}</bundle>
+
<bundle>mvn:org.apache.activemq/activemq-pool/${activemq.version}</bundle>
+
<bundle>mvn:org.apache.activemq/activemq-karaf/${activemq.version}</bundle>
+
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
+ </feature>
+
+ <feature name="activemq-spring" version="${activemq.version}">
+ <feature version="${spring.osgi.version}">spring-dm</feature>
+ <feature version="${activemq.version}">activemq</feature>
+
<bundle>mvn:org.apache.activemq/activemq-spring/${activemq.version}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-spring/${xbean.version}</bundle>
+ </feature>
+
+ <feature name="activemq-blueprint" version="${activemq.version}">
+ <feature version="${activemq.version}">activemq</feature>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
+
<bundle>mvn:org.apache.commons/commons-jexl/${commons-jexl.version}</bundle>
+ <bundle>mvn:org.apache.xbean/xbean-blueprint/${xbean.version}</bundle>
+
<bundle>mvn:org.apache.activemq/activemq-blueprint/${activemq.version}</bundle>
+ </feature>
+
+ <!-- do "features:install war" before installing this one -->
+ <feature name="activemq-web-console" version="${activemq.version">
+
<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: servicemix/smx4/features/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1022051&r1=1022050&r2=1022051&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Wed Oct 13 09:49:26 2010
@@ -272,7 +272,6 @@
<!-- Other Dependencies -->
<axiom.version>1.2.8</axiom.version>
<bouncycastle.version>140</bouncycastle.version>
- <commons-collections.version>3.2.1</commons-collections.version>
<commons-dbcp.version>1.3</commons-dbcp.version>
<commons-jexl.version>2.0.1</commons-jexl.version>
<commons-jxpath.version>1.3</commons-jxpath.version>
@@ -1174,11 +1173,6 @@
<version>${jaxp-ri.version}</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons-collections.version}</version>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
