Don't provide a properties file, force the default to be used in all …

…cases instead.
projectodd · Apr 9, 2015 · 30c4a21 · 30c4a21
1 parent bdbd9fd
commit 30c4a21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 27 deletions.
diff --git a/...ransactions/src/main/java/org/projectodd/wunderboss/transactions/NarayanaTransaction.java b/...ransactions/src/main/java/org/projectodd/wunderboss/transactions/NarayanaTransaction.java
@@ -94,6 +94,12 @@ public String name() {
 
     @Override
     public synchronized TransactionManager manager() {
+        // jbossts-properties.xml won't be loaded in an uberjar
+        // without this - see JBTM-2357
+        String propName = "com.arjuna.ats.arjuna.common.propertiesFile";
+        if (System.getProperty(propName) == null) {
+            System.setProperty(propName, "jbossts-properties.xml");
+        }
         if (this.manager == null) {
             this.manager = com.arjuna.ats.jta.TransactionManager.transactionManager();
         }

diff --git a/modules/transactions/src/main/resources/arjuna-properties.xml b/modules/transactions/src/main/resources/arjuna-properties.xml