Author: gnodet
Date: Wed Feb 18 17:14:30 2009
New Revision: 745576
URL: http://svn.apache.org/viewvc?rev=745576&view=rev
Log:
SMX4NMR-96: The transaction manager given to JBI components should implement
RecoverableTransactionManager
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=745576&r1=745575&r2=745576&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Wed Feb 18 17:14:30 2009
@@ -77,7 +77,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Import-Package>javax.transaction,*</Import-Package>
+ <Import-Package>
+ javax.transaction,
+
org.apache.geronimo.transaction.manager;resolution:=optional,
+ *
+ </Import-Package>
<Export-Package>org.apache.servicemix.jbi.deployer*,org.apache.servicemix.jbi.management*</Export-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml?rev=745576&r1=745575&r2=745576&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
(original)
+++
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
Wed Feb 18 17:14:30 2009
@@ -105,7 +105,8 @@
<!-- Reference to the Transaction Manager -->
<osgi:list id="transactionManagers"
interface="javax.transaction.TransactionManager"
- cardinality="0..N" />
+ cardinality="0..N"
+ greedy-proxying="true" />
<!-- The InitialContext -->
<bean id="namingContext" class="javax.naming.InitialContext">
Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=745576&r1=745575&r2=745576&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Wed Feb 18 17:14:30 2009
@@ -63,6 +63,7 @@
javax.management,
javax.naming,
javax.transaction,
+
org.apache.geronimo.transaction.manager;resolution:=optional,
org.apache.servicemix.document,
org.apache.servicemix.nmr.api,
org.apache.servicemix.jbi.runtime,
Modified:
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml?rev=745576&r1=745575&r2=745576&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
(original)
+++
servicemix/smx4/nmr/trunk/jbi/osgi/src/main/resources/META-INF/spring/servicemix-jbi.xml
Wed Feb 18 17:14:30 2009
@@ -72,7 +72,8 @@
<!-- Reference to the Transaction Manager -->
<osgi:list id="transactionManagers"
interface="javax.transaction.TransactionManager"
- cardinality="0..N" />
+ cardinality="0..N"
+ greedy-proxying="true" />
<!-- Reference to the JMX server -->
<osgi:list id="mbeanServers"
