lib/active_support/cache/ehcache_store.rb in jruby-ehcache-rails2-1.1.2 vs lib/active_support/cache/ehcache_store.rb in jruby-ehcache-rails2-1.2.0

@@ -1,20 +1,19 @@
-require 'ehcache/rails/ehcache_rails_common'
+require 'ehcache/active_support_store'
 
+# Rails 3 cache store implementation which stores data in Ehcache:
+# http://www.ehcache.org/
+
 module ActiveSupport
   module Cache
+    class EhcacheStore < Ehcache::ActiveSupportStore
 
-    # Rails 3 cache store implementation which stores data in Ehcache:
-    # http://www.ehcache.org/
-    class EhcacheStore < Store
-      include Ehcache::Rails
-
       def initialize(*args)
         args = args.flatten
         options = args.extract_options!
         super(options)
         self.create_cache_manager(options)
-        @ehcache = self.create_cache(options)   # This comes from the Ehcache::Rails mixin.
+        @ehcache = self.create_cache(options)
         extend Strategy::LocalCache
       end
 
       def increment(name, amount = 1, options = nil) # :nodoc:
         @ehcache.compare_and_swap(name) { |current_value|