diff options
| author | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-20 13:55:49 +0000 |
|---|---|---|
| committer | bdaniel <bdaniel@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-20 13:55:49 +0000 |
| commit | b7e99c9047fd720460b3492c64b4bede6193baa4 (patch) | |
| tree | 839c30089c990f37f1011c43670b72e7c77dfa0a /sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo | |
| parent | 2c9297fdfe03c0b9a0d4bcb0c24646488725547f (diff) | |
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
Diffstat (limited to 'sca-java-2.x/trunk/modules/policy-transaction-runtime-geronimo')
2 files changed, 4 insertions, 5 deletions
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); } |