torquebox-transactions 2.0.1 → 2.0.2

data/lib/torquebox/active_record_adapters.rb

@@ -15,7 +15,12 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'arjdbc'
+begin
+  require 'arjdbc'
+  TORQUEBOX_XA_JDBC = true
+rescue LoadError
+  TORQUEBOX_XA_JDBC = false
+end
 require 'set'
 
 module TorqueBox
@@ -27,15 +32,17 @@ module TorqueBox
 
       module Connection
 
-        def transaction(*)
-          super
-        rescue ActiveRecord::JDBCError => e
-          unless self.is_a?(XAResource)
-            puts "Creating an XAResource; exception=#{e}"
-            self.extend(XAResource)
-            retry
-          else
-            raise
+        if TORQUEBOX_XA_JDBC
+          def transaction(*)
+            super
+          rescue ActiveRecord::JDBCError => e
+            unless self.is_a?(XAResource)
+              puts "Creating an XAResource; exception=#{e}"
+              self.extend(XAResource)
+              retry
+            else
+              raise
+            end
           end
         end
 
@@ -114,14 +121,16 @@ module TorqueBox
   end
 end
 
-module ActiveRecord
-  module ConnectionAdapters
-    class JdbcAdapter 
-      include TorqueBox::Transactions::ActiveRecordAdapters::Connection
+if TORQUEBOX_XA_JDBC
+  module ActiveRecord
+    module ConnectionAdapters
+      class JdbcAdapter
+        include TorqueBox::Transactions::ActiveRecordAdapters::Connection
+      end
     end
   end
 end
-  
+
 module TorqueBox
   module Transactions
     class Manager

metadata

@@ -2,7 +2,7 @@
 name: torquebox-transactions
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2012-05-01 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: torquebox-core
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.1
+            version: 2.0.2
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -45,8 +45,8 @@ extra_rdoc_files: []
 
 files: 
   - licenses/lgpl-2.1.txt
-  - lib/torquebox/transactions.rb
   - lib/torquebox/active_record_adapters.rb
+  - lib/torquebox/transactions.rb
   - lib/torquebox/transactions/ext/active_record/base.rb
 homepage: http://torquebox.org/
 licenses: