From b7e99c9047fd720460b3492c64b4bede6193baa4 Mon Sep 17 00:00:00 2001
From: bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 20 Oct 2010 13:55:49 +0000
Subject: TUSCANY-3701 Update to geronimo 2.1.4 to avoid slf4j error and remove
 workaround

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1025582 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/modules/policy-transaction-runtime-geronimo/pom.xml        | 4 ++--
 .../transaction/runtime/geronimo/TransactionModuleActivator.java     | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo')

diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
index 2f8e9d0da0..1c771eb6d7 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
index eb3cf186d1..e5ff21fca9 100644
--- a/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
+++ b/sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo/src/main/java/org/apache/tuscany/sca/policy/transaction/runtime/geronimo/TransactionModuleActivator.java
@@ -53,9 +53,8 @@ public class TransactionModuleActivator implements ModuleActivator {
             }
         }
         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);
         }
-- 
cgit v1.2.3