Author: gnodet
Date: Wed Feb 11 12:25:12 2009
New Revision: 743310
URL: http://svn.apache.org/viewvc?rev=743310&view=rev
Log:
SMX4-208: make activemq feature depends on transaction
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Modified:
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml?rev=743310&r1=743309&r2=743310&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
(original)
+++
servicemix/smx4/features/trunk/activemq/activemq-commands/src/main/resources/org/apache/servicemix/kernel/gshell/activemq/broker.xml
Wed Feb 11 12:25:12 2009
@@ -120,8 +120,7 @@
<property name="resourceName" value="activemq.${name}" />
</bean>
- <osgi:reference id="transactionManager"
interface="javax.transaction.TransactionManager"
- cardinality="0..1"/>
+ <osgi:reference id="transactionManager"
interface="javax.transaction.TransactionManager" />
<osgi:service ref="pooledConnectionFactory">
Modified:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml?rev=743310&r1=743309&r2=743310&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/deploy/activemq-broker.xml
Wed Feb 11 12:25:12 2009
@@ -117,8 +117,7 @@
<property name="resourceName" value="activemq.default" />
</bean>
- <osgi:reference id="transactionManager"
interface="javax.transaction.TransactionManager"
- cardinality="0..1"/>
+ <osgi:reference id="transactionManager"
interface="javax.transaction.TransactionManager" />
<osgi:service ref="pooledConnectionFactory">
<osgi:interfaces>
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=743310&r1=743309&r2=743310&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
Wed Feb 11 12:25:12 2009
@@ -43,6 +43,7 @@
<bundle>mvn:org.apache.servicemix.war/org.apache.servicemix.war.deployer/${version}</bundle>
</feature>
<feature name="activemq">
+ <feature>transaction</feature>
<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>
