You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2010/10/20 15:55:49 UTC
svn commit: r1025582 - in
/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo:
pom.xml
src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
Author: bdaniel
Date: Wed Oct 20 13:55:49 2010
New Revision: 1025582
URL: http://svn.apache.org/viewvc?rev=1025582&view=rev
Log:
TUSCANY-3701 Update to geronimo 2.1.4 to avoid slf4j error and remove workaround
Modified:
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
Modified: tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml?rev=1025582&r1=1025581&r2=1025582&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml Wed Oct 20 13:55:49 2010
@@ -56,13 +56,13 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>2.1.3</version>
+ <version>2.1.4</version>
</dependency>
</dependencies>
Modified: tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java?rev=1025582&r1=1025581&r2=1025582&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java Wed Oct 20 13:55:49 2010
@@ -53,9 +53,8 @@ public class TransactionModuleActivator
}
}
try {
- wrapper = new TransactionManagerWrapper();
-// TUSCANY-3701 - prevent the transaction manager from starting under OSGi for the time being
-// wrapper.start();
+ wrapper = new TransactionManagerWrapper();
+ wrapper.start();
} catch (Exception e) {
throw new IllegalStateException(e);
}