Author: gnodet
Date: Tue Jul 6 07:05:42 2010
New Revision: 960822
URL: http://svn.apache.org/viewvc?rev=960822&view=rev
Log:
SMX4NMR-203: Switch to Aries transaction manager
Removed:
servicemix/smx4/nmr/trunk/transaction/
Modified:
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=960822&r1=960821&r2=960822&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Tue Jul 6 07:05:42 2010
@@ -185,6 +185,10 @@
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-annotation</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.manager</artifactId>
+ </dependency>
</dependencies>
<build>
<resources>
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=960822&r1=960821&r2=960822&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
Tue Jul 6 07:05:42 2010
@@ -20,8 +20,8 @@
<feature name="naming" version="${version}">
<bundle>mvn:org.apache.servicemix.naming/org.apache.servicemix.naming/${pom.version}</bundle>
</feature>
- <feature name="transaction" version="${version}">
-
<bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/${version}</bundle>
+ <feature name="transaction" version="${aries.transaction.version}">
+
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.transaction.version}</bundle>
</feature>
<feature name="document" version="${version}">
<bundle>mvn:org.apache.servicemix.document/org.apache.servicemix.document/${pom.version}</bundle>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=960822&r1=960821&r2=960822&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Jul 6 07:05:42 2010
@@ -37,7 +37,6 @@
<module>branding</module>
<module>document</module>
<module>naming</module>
- <module>transaction</module>
<module>nmr</module>
<module>testing</module>
<module>jbi</module>
@@ -81,6 +80,8 @@
<ant.version>1.7.0_3</ant.version>
<aopalliance.version>1.0_3</aopalliance.version>
<asm.version>2.2.3_1</asm.version>
+ <aries.transaction.version>0.1-incubating</aries.transaction.version>
+ <aries.blueprint.version>0.1-incubating</aries.blueprint.version>
<cglib.version>2.1_3_4</cglib.version>
<camel.version>2.4-SNAPSHOT</camel.version>
<commons.io.version>1.3.2_1</commons.io.version>
@@ -98,7 +99,6 @@
<felix.fileinstall.version>3.0.0</felix.fileinstall.version>
<felix.gogo.version>0.4.0</felix.gogo.version>
<osgi.core.version>4.2.0</osgi.core.version>
- <aries.blueprint.version>0.1-incubating</aries.blueprint.version>
<geronimo.j2ee.connector.version>2.0.0</geronimo.j2ee.connector.version>
<geronimo.jms.version>1.1.1</geronimo.jms.version>
<geronimo.jta.version>1.1.1</geronimo.jta.version>
@@ -773,6 +773,11 @@
<artifactId>org.apache.aries.blueprint</artifactId>
<version>${aries.blueprint.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.transaction</groupId>
+ <artifactId>org.apache.aries.transaction.manager</artifactId>
+ <version>${aries.transaction.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
