Fixing TORQUE-409 again, it seems.

torquebox · May 20, 2011 · 26bdad3 · 26bdad3
1 parent 042c030
commit 26bdad3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/clients/torquebox/lib/torquebox.rb b/clients/torquebox/lib/torquebox.rb
@@ -18,4 +18,5 @@
 require 'torquebox-base'
 require 'torquebox-naming'
 require 'torquebox-messaging'
+require 'torquebox-web'
 require 'torquebox-rake-support'
diff --git a/components/web/web-gem/lib/action_controller/session/torque_box_store.rb b/components/web/web-gem/lib/action_controller/session/torque_box_store.rb
@@ -15,6 +15,8 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'torquebox/session/servlet_store'
+
 module ActionController
   module Session
     class TorqueBoxStore < TorqueBox::Session::ServletStore

diff --git a/components/web/web-gem/lib/action_dispatch/session/torque_box_store.rb b/components/web/web-gem/lib/action_dispatch/session/torque_box_store.rb
@@ -15,6 +15,8 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'torquebox/session/servlet_store'
+
 module ActionDispatch
   module Session
     class TorqueBoxStore < TorqueBox::Session::ServletStore

diff --git a/components/web/web-gem/lib/gem_hook.rb b/components/web/web-gem/lib/gem_hook.rb
@@ -1,2 +1,3 @@
 
-require 'torquebox/session/servlet_store'
+require 'action_dispatch/session/torque_box_store'
+require 'action_controller/session/torque_box_store'