torquebox-web 2.0.0.beta1-java → 2.0.0.beta2-java

data/lib/action_controller/session/torque_box_store.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
@@ -15,8 +15,6 @@
 # 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

data/lib/action_dispatch/session/torque_box_store.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
@@ -15,8 +15,6 @@
 # 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

data/lib/gem_hook.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
@@ -15,6 +15,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'action_dispatch/session/torque_box_store'
-require 'action_controller/session/torque_box_store'
+require 'torquebox/session/servlet_store'
+require 'action_dispatch/session/torque_box_store' if defined?(ActionDispatch) || ENV['TORQUEBOX_APP_TYPE'] == 'rails'
+require 'action_controller/session/torque_box_store' if defined?(ActionController) || ENV['TORQUEBOX_APP_TYPE'] == 'rails'
 

data/lib/torquebox/session/servlet_store.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
 # 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as

data/lib/torquebox-web.rb

@@ -1,6 +1,6 @@
 module TorqueboxWeb
-  VERSION = '2.0.0.beta1'
-  MAVEN_VERSION = '2.0.0.beta1'
+  VERSION = '2.0.0.beta2'
+  MAVEN_VERSION = '2.0.0.beta2'
 end
 begin
   require 'java'

metadata

@@ -2,7 +2,7 @@
 name: torquebox-web
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-01-05 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: actionpack