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

1 files changed, 2 insertions, 3 deletions

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);
         }