Author: gnodet
Date: Thu Jun 12 05:50:07 2008
New Revision: 667063
URL: http://svn.apache.org/viewvc?rev=667063&view=rev
Log:
Fix amq / tx integration so that transactions can be recovered correctly
Modified:
servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/features/trunk/transaction/transaction/pom.xml
servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
Modified: servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml?rev=667063&r1=667062&r2=667063&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml (original)
+++ servicemix/smx4/features/trunk/activemq/activemq-rm/pom.xml Thu Jun 12
05:50:07 2008
@@ -121,7 +121,7 @@
<Private-Package>
org.apache.commons.pool*,
org.jencks.amqpool*,
- org.apache.servicemix.activemq*,
+ org.apache.servicemix.activemq.rm*,
</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
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=667063&r1=667062&r2=667063&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
Thu Jun 12 05:50:07 2008
@@ -36,7 +36,10 @@
<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</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/activemq-core/${activemq.version}</bundle>
+
<bundle>mvn:org.apache.activemq/activemq-console/${activemq.version}</bundle>
+
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.rm/${version}</bundle>
+
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/${version}</bundle>
</feature>
<feature name="cxf">
<bundle>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
@@ -81,7 +84,7 @@
</feature>
<feature name="camel-nmr">
<feature>camel</feature>
- <feature>nmr</feature>
+ <feature>nmr</feature>
<bundle>mvn:org.apache.servicemix.camel/org.apache.servicemix.camel.component/${version}</bundle>
</feature>
<feature name="examples-cxf-osgi">
Modified: servicemix/smx4/features/trunk/transaction/transaction/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/transaction/pom.xml?rev=667063&r1=667062&r2=667063&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/transaction/transaction/pom.xml (original)
+++ servicemix/smx4/features/trunk/transaction/transaction/pom.xml Thu Jun 12
05:50:07 2008
@@ -99,6 +99,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
javax.transaction,
+ org.apache.geronimo.transaction.manager,
org.springframework.transaction,
org.jencks.factory
</Import-Package>
Modified:
servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml?rev=667063&r1=667062&r2=667063&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
(original)
+++
servicemix/smx4/features/trunk/transaction/transaction/src/main/resources/META-INF/spring/servicemix-tx.xml
Thu Jun 12 05:50:07 2008
@@ -41,6 +41,7 @@
<osgi:service ref="transactionManager">
<osgi:interfaces>
<value>javax.transaction.TransactionManager</value>
+
<value>org.apache.geronimo.transaction.manager.RecoverableTransactionManager</value>
<value>org.springframework.transaction.PlatformTransactionManager</value>
</osgi:interfaces>
</osgi:service>
