torquebox-cache 2.0.3-java → 2.1.0-java

data/lib/active_support/cache/torque_box_store.rb

@@ -84,6 +84,10 @@ module ActiveSupport
 
       protected
 
+      def defaults
+        {:name=>'__torque_box_store__', :mode => :invalidation, :sync => false}
+      end
+
       def encode value
         Marshal.dump(value).to_java_bytes
       end
@@ -116,7 +120,7 @@ module ActiveSupport
       private
 
       def cache
-        @cache ||= TorqueBox::Infinispan::Cache.new(options)
+        @cache ||= TorqueBox::Infinispan::Cache.new( defaults.merge(options) )
       end
     end
   end

data/lib/cache.rb

@@ -18,6 +18,7 @@
 require 'torquebox/kernel'
 require 'torquebox/injectors'
 require 'torquebox/transactions'
+require 'sequence'
 
 module TorqueBox
   module Infinispan
@@ -31,7 +32,7 @@ module TorqueBox
       end
 
       def getTransactionManager
-        inject('transaction-manager')
+        fetch('transaction-manager')
       end
     end
 
@@ -45,40 +46,6 @@ module TorqueBox
       end
     end
 
-    class Sequence
-      include java.io.Serializable
-
-      class Codec
-        def self.encode(sequence)
-          sequence.value.to_s
-        end
-
-        def self.decode(sequence_bytes)
-          sequence_bytes && Sequence.new( sequence_bytes.to_s.to_i )
-        end
-      end
-
-      def initialize(amount = 1) 
-        @data = amount
-      end
-
-      def value
-        @data ? @data.to_i : @data
-      end
-
-      def next(amount = 1)
-        Sequence.new( @data.to_i + amount )
-      end
-
-      def ==(other)
-        self.value == other.value
-      end
-
-      def to_s
-        "Sequence: #{self.value}"
-      end
-    end
-
     class Cache
       include TorqueBox::Injectors
 
@@ -87,8 +54,9 @@ module TorqueBox
         java_import org.infinispan.config.Configuration::CacheMode
         java_import org.infinispan.transaction::TransactionMode
         java_import org.infinispan.transaction::LockingMode
+        java_import org.projectodd.polyglot.cache.as::CacheService
         INFINISPAN_AVAILABLE = true
-      rescue NameError
+      rescue NameError => e
         INFINISPAN_AVAILABLE = false
         # Not running inside TorqueBox
       end
@@ -106,21 +74,38 @@ module TorqueBox
         options[:name] || TORQUEBOX_APP_NAME
       end
 
-      def search_manager
-        @search_manager ||= org.infinispan.query.Search.getSearchManager(@cache)
+      def persisted?
+        !options[:persist].nil?
+      end
+
+      def replicated?
+        [:r, :repl, :replicated, :replication].include? options[:mode]
+      end
+
+      def distributed?
+        [:d, :dist, :distributed, :distribution].include? options[:mode]
+      end
+
+      def invalidated?
+        [:i, :inv, :invalidated, :invalidation].include? options[:mode] 
+      end
+
+      def clustered?
+        INFINISPAN_AVAILABLE && service.clustered? 
       end
 
       def clustering_mode
-        replicated =  [:r, :repl, :replicated, :replication].include? options[:mode]
-        distributed = [:d, :dist, :distributed, :distribution].include? options[:mode]
+        return CacheMode::LOCAL unless clustered?
         sync = options[:sync]
         case
-        when replicated 
+        when replicated?
           sync ? CacheMode::REPL_SYNC : CacheMode::REPL_ASYNC
-        when distributed
+        when distributed?
           sync ? CacheMode::DIST_SYNC : CacheMode::DIST_ASYNC
-        else
+        when invalidated?
           sync ? CacheMode::INVALIDATION_SYNC : CacheMode::INVALIDATION_ASYNC
+        else
+          sync ? CacheMode::DIST_SYNC : CacheMode::DIST_ASYNC
         end
       end
 
@@ -220,7 +205,7 @@ module TorqueBox
       def transaction(&block)
         if !transactional?
           yield self
-        elsif inject('transaction-manager').nil? 
+        elsif fetch('transaction-manager').nil?
           tm = cache.getAdvancedCache.getTransactionManager
           begin
             tm.begin if tm
@@ -258,15 +243,6 @@ module TorqueBox
         cache.stop
       end
 
-      def self.shutdown
-        Cache.local_managers.each { |m| m.stop }
-      end
-
-      @@local_managers = []
-      def self.local_managers
-        @@local_managers
-      end
-
       def self.log( message, status = 'INFO' )
         $stdout.puts( "#{status}: #{message}" )
       end
@@ -282,108 +258,62 @@ module TorqueBox
       end
 
       def cache
-        if INFINISPAN_AVAILABLE
-          @cache ||= clustered || local || nothing
+        if INFINISPAN_AVAILABLE 
+          @cache ||= manager.running?( name ) ? reconfigure : configure
         else
           @cache ||= nothing
         end
       end
 
+      def service
+        @service ||= TorqueBox::ServiceRegistry[CacheService::CACHE]
+      end
+
       def manager
-        begin
-          @manager ||= TorqueBox::ServiceRegistry[org.jboss.msc.service.ServiceName::JBOSS.append( "infinispan", "torquebox" )]
-        rescue Exception => e
-          log( "Caught exception while looking up Infinispan service.", 'ERROR' )
-          log( e.message, 'ERROR' )
-        end
-        @manager
+        @manager ||= service.cache_container
       end
-                       
+
       def reconfigure(mode=clustering_mode)
-        cache = manager.get_cache(name)
-        base_config = cache.configuration
+        existing_cache  = manager.get_cache(name)
+        base_config = existing_cache.configuration
         unless base_config.cache_mode == mode
           log( "Reconfiguring Infinispan cache #{name} from #{base_config.cache_mode} to #{mode}" )
-          cache.stop
-          base_config.cache_mode = mode
-          config = base_config.fluent
-          config.transaction.transactionMode( transaction_mode )
-          config.transaction.recovery.transactionManagerLookup( transaction_manager_lookup )
-          manager.define_configuration(name, config.build)
-          cache.start
+          existing_cache .stop
+          configure(mode)
+          existing_cache .start
         end
-        return cache
+        return existing_cache 
       end
 
       def configure(mode=clustering_mode)
         log( "Configuring Infinispan cache #{name} as #{mode}" )
         base_config = manager.default_configuration.clone
-        base_config.class_loader = java.lang::Thread.current_thread.context_class_loader
         base_config.cache_mode = mode
-
         config = base_config.fluent
         config.transaction.transactionMode( transaction_mode )
-        config.transaction.recovery.transactionManagerLookup( transaction_manager_lookup )
-        manager.define_configuration(name, config.build )
-        manager.get_cache(name)
-      end
-
-      def transaction_manager_lookup
-        @tm ||= if inject('transaction-manager')
-                  ContainerTransactionManagerLookup.new 
-                else
-                  org.infinispan.transaction.lookup.GenericTransactionManagerLookup.new
-                end
-      end
-
-      def clustered
-        (manager.running?(name) ? reconfigure : configure) if manager
-      rescue
-        log( "Clustered: Can't get clustered cache; falling back to local: #{$!}", 'ERROR' )
-      end
-
-      def local
-        log( "Configuring Infinispan local cache #{name}" )
-        bare_config = org.infinispan.config.Configuration.new
-        bare_config.class_loader = java.lang::Thread.current_thread.context_class_loader
-
-        config  = bare_config.fluent
-        config.transaction.transactionMode( transaction_mode )
-
         if transactional?
           config.transaction.transactionManagerLookup( transaction_manager_lookup ) 
           config.transaction.lockingMode( locking_mode )
         end
-        
-        if options[:persist]
-          log( "Configuring #{name} local cache for file-based persistence" )
+        if persisted?
           store = org.infinispan.loaders.file.FileCacheStoreConfig.new
           store.purge_on_startup( false )
           store.location(options[:persist]) if File.exist?( options[:persist].to_s ) 
           config.loaders.add_cache_loader( store )
         end
+        manager.define_configuration(name, config.build )
+        manager.get_cache(name)
+      end
 
-        if options[:index]
-          log( "Configuring #{name} local cache for local-only indexing" )
-          config.indexing.index_local_only(true)
-        else
-          log( "Configuring #{name} local cache with no indexing" )
-          config.indexing.disable
-        end
-
-        if ((local_manager = Cache.find_local_manager(name)) == nil)
-          log( "No local CacheManager exists for #{name}. Creating one." )
-          local_manager = org.infinispan.manager.DefaultCacheManager.new
-          local_manager.define_configuration( name, config.build )
-          Cache.local_managers << local_manager
-        end
-
-        local_manager.get_cache( self.name )
-      rescue Exception => e
-        log( "Unable to obtain local cache: #{$!}", 'ERROR' )
-        log( e.backtrace, 'ERROR' )
+      def transaction_manager_lookup
+        @tm ||= if fetch('transaction-manager')
+                  ContainerTransactionManagerLookup.new 
+                else
+                  org.infinispan.transaction.lookup.GenericTransactionManagerLookup.new
+                end
       end
 
+
       def nothing
         result = Object.new
         def result.method_missing(*args); end
@@ -401,25 +331,11 @@ module TorqueBox
           args << expires_in << SECONDS
           args << expires << SECONDS
         end
-        #$stderr.puts "cache=#{cache.inspect}"
-        #$stderr.puts "*args=#{args.inspect}"
         cache.send( *args ) && true
       end
 
-      # Finds the CacheManager for a given cache and returns it - or nil if not found
-      def self.find_local_manager( cache_name )
-        local_managers.each do |m|
-          if m.cache_exists( cache_name )
-            log( ":-:-:-: local_manager already exists for #{cache_name}" )
-            return m 
-          end
-        end
-        return nil
-      end
-
     end
 
-    at_exit { Cache.shutdown }
   end
 end
 

data/lib/cache_listener.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 'jruby/core_ext'
+
 module TorqueBox
   module Infinispan
     class CacheListener
@@ -28,7 +30,11 @@ module TorqueBox
         end
       end
 
-      add_class_annotation( { org.infinispan.notifications.Listener => { } } )
+      if JRUBY_VERSION =~ /^1\.7/
+        add_class_annotations( { org.infinispan.notifications.Listener => { } } )
+      else
+        add_class_annotation( { org.infinispan.notifications.Listener => { } } )
+      end
       add_method_signature( "event_fired", [java.lang.Void::TYPE, org.infinispan.notifications.cachelistener.event.Event] )
       add_method_annotation( "event_fired", 
                             { org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated    => {},

data/lib/gem_hook.rb

@@ -16,7 +16,10 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'cache'
-#require 'active_support/cache/torque_box_store.rb'
-#require 'datamapper/dm-infinispan-adapter'
-
+begin
+  ActiveSupport
+  require 'active_support/cache/torque_box_store.rb'
+rescue NameError
+  # ActiveSupport not used
+end
 

data/lib/{dm-infinispan-adapter.rb → sequence.rb}

@@ -1,4 +1,4 @@
-# Copyright 2008-2012 Red Hat, Inc, and individual contributors.
+# Copyright 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,4 +15,44 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require 'datamapper/dm-infinispan-adapter'
+module TorqueBox
+  module Infinispan
+
+    class Sequence
+      include java.io.Serializable
+
+      class Codec
+        def self.encode(sequence)
+          sequence.value.to_s
+        end
+
+        def self.decode(sequence_bytes)
+          sequence_bytes && Sequence.new( sequence_bytes.to_s.to_i )
+        end
+      end
+
+      def initialize(amount = 1) 
+        @data = amount
+      end
+
+      def value
+        @data ? @data.to_i : @data
+      end
+
+      def next(amount = 1)
+        Sequence.new( @data.to_i + amount )
+      end
+
+      def ==(other)
+        self.value == other.value
+      end
+
+      def to_s
+        "Sequence: #{self.value}"
+      end
+    end
+
+  end
+end
+
+

data/lib/torquebox-cache.rb

@@ -1,10 +1,12 @@
 module TorqueboxCache
-  VERSION = '2.0.3'
-  MAVEN_VERSION = '2.0.3'
+  VERSION = '2.1.0'
+  MAVEN_VERSION = '2.1.0'
 end
 begin
   require 'java'
   require File.dirname(__FILE__) + '/torquebox-cache.jar'
+  require File.dirname(__FILE__) + '/polyglot-cache-1.7.1.jar'
+  require File.dirname(__FILE__) + '/polyglot-core-1.7.1.jar'
 rescue LoadError
   puts 'JAR-based gems require JRuby to load. Please visit www.jruby.org.'
   raise

data/spec/cache_listener_spec.rb

@@ -19,6 +19,10 @@ require 'cache_listener'
 
 describe TorqueBox::Infinispan::CacheListener do
   before :each do
+    manager = org.infinispan.manager.DefaultCacheManager.new 
+    service = org.projectodd.polyglot.cache.as.CacheService.new
+    service.stub!(:cache_container).and_return( manager )
+    TorqueBox::ServiceRegistry.stub!(:[]).with(org.projectodd.polyglot.cache.as.CacheService::CACHE).and_return( service )
     @cache = TorqueBox::Infinispan::Cache.new( :name => 'foo-cache' )
   end
 

data/spec/cache_spec.rb

@@ -18,6 +18,10 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe TorqueBox::Infinispan::Cache do
   before :each do
+    manager = org.infinispan.manager.DefaultCacheManager.new 
+    service = org.projectodd.polyglot.cache.as.CacheService.new
+    service.stub!(:cache_container).and_return( manager )
+    TorqueBox::ServiceRegistry.stub!(:[]).with(org.projectodd.polyglot.cache.as.CacheService::CACHE).and_return( service )
     @cache = TorqueBox::Infinispan::Cache.new( :name => 'foo-cache' )
   end
 
@@ -29,11 +33,6 @@ describe TorqueBox::Infinispan::Cache do
     @cache.name.should == 'foo-cache'
   end
 
-  it "should reuse existing cache managers for an extant local cache" do
-    TorqueBox::Infinispan::Cache.should_receive( :find_local_manager ).with( 'foo-cache' )
-    TorqueBox::Infinispan::Cache.new( :name => 'foo-cache' )
-  end
-
   it "should respond to clustering_mode" do
     @cache.should respond_to( :clustering_mode ) 
   end
@@ -127,9 +126,7 @@ describe TorqueBox::Infinispan::Cache do
   end
 
   it "should increment a sequence" do
-    puts "AAAA"
     @cache.increment("My Sequence Name", 1).should == 1
-    puts "BBBB"
     @cache.increment("My Sequence Name", 1).should == 2
   end
 
@@ -144,6 +141,37 @@ describe TorqueBox::Infinispan::Cache do
     @cache.get('a false value').should be_false
   end
 
+  it "should allow symbols as keys for basic put" do
+    @cache.put(:asymbol, "a value")
+    @cache.get(:asymbol).should == "a value"
+  end
+
+  it "should allow symbols as keys for put_if_absent" do
+    @cache.put_if_absent(:asymbol, "a value")
+    @cache.get(:asymbol).should == "a value"
+  end
+
+  it "should allow symbols as keys for increment" do
+    @cache.increment :countsymbol
+    @cache.get(:countsymbol).should == "1"
+    @cache.increment(:countsymbol).should == 2
+  end
+
+  it "should store and retrieve zero" do
+    @cache.put(:mynumber, 0)
+    @cache.get(:mynumber).should == 0
+  end
+
+  it "should store and retrieve integers" do
+    @cache.put(:mynumber, 30)
+    @cache.get(:mynumber).should == 30
+  end
+
+  it "should store and retrieve floats" do
+    @cache.put(:mynumber, 1.0)
+    @cache.get(:mynumber).should == 1.0
+  end
+
   it "should expire entries based on provided expiry durations" do
     cache = TorqueBox::Infinispan::Cache.new( :name => 'expiring-cache' )
     cache.put("foo", "bar", 0.1)
@@ -323,21 +351,6 @@ describe TorqueBox::Infinispan::Cache do
     end
   end
 
-  describe "with search" do
-    before :each do
-      @cache = TorqueBox::Infinispan::Cache.new( :name => 'foo-cache' )
-    end
-
-    it "should ask the cache for the search managager" do
-      @cache.should_receive :search_manager
-      Infinispan::Search.new(@cache, lambda{|v|v})
-    end
-
-    after :each do
-      @cache.clear
-    end
-  end
-
 end
 
 class Snuffleuffagus