torquebox-cache 2.1.2-java → 2.2.0-java

data/lib/active_support/cache/torque_box_store.rb

@@ -19,8 +19,10 @@ require 'active_support/cache'
 require 'torquebox/kernel'
 require 'cache'
 
+# @api private
 module ActiveSupport
   module Cache
+    # @api public
     class TorqueBoxStore < Store
 
       SECONDS = java.util.concurrent.TimeUnit::SECONDS

data/lib/cache.rb

@@ -23,6 +23,7 @@ require 'sequence'
 module TorqueBox
   module Infinispan
 
+    # @api private
     class ContainerTransactionManagerLookup
       include TorqueBox::Injectors
       begin
@@ -51,7 +52,8 @@ module TorqueBox
 
       SECONDS = java.util.concurrent.TimeUnit::SECONDS
       begin
-        java_import org.infinispan.config.Configuration::CacheMode
+        java_import org.infinispan.configuration.cache::CacheMode
+        java_import org.infinispan.configuration.cache::ConfigurationBuilder
         java_import org.infinispan.transaction::TransactionMode
         java_import org.infinispan.transaction::LockingMode
         java_import org.projectodd.polyglot.cache.as::CacheService
@@ -275,31 +277,29 @@ module TorqueBox
 
       def reconfigure(mode=clustering_mode)
         existing_cache  = manager.get_cache(name)
-        base_config = existing_cache.configuration
-        unless base_config.cache_mode == mode
+        base_config = existing_cache.cache_configuration
+        unless base_config.clustering.cache_mode == mode
           log( "Reconfiguring Infinispan cache #{name} from #{base_config.cache_mode} to #{mode}" )
-          existing_cache .stop
+          existing_cache.stop
           configure(mode)
-          existing_cache .start
+          existing_cache.start
         end
-        return existing_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.cache_mode = mode
-        config = base_config.fluent
+        config = ConfigurationBuilder.new.read( manager.default_cache_configuration )
+        config.clustering.cacheMode( mode )
         config.transaction.transactionMode( transaction_mode )
         if transactional?
-          config.transaction.transactionManagerLookup( transaction_manager_lookup ) 
+          config.transaction.transactionManagerLookup( transaction_manager_lookup )
           config.transaction.lockingMode( locking_mode )
         end
         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 )
+          store = config.loaders.add_file_cache_store
+          store.purgeOnStartup( false )
+          store.location(options[:persist]) if File.exist?( options[:persist].to_s )
         end
         manager.define_configuration(name, config.build )
         manager.get_cache(name)

data/lib/torquebox-cache.rb

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

data/spec/torque_box_store_spec.rb

@@ -1,7 +1,7 @@
 require 'active_support/cache/torque_box_store'
 require 'logger'
 
-java_import org.infinispan.config.Configuration::CacheMode
+java_import org.infinispan.configuration.cache::CacheMode
 include ActiveSupport::Cache
 
 TORQUEBOX_APP_NAME = 'active-support-unit-test'

metadata

@@ -1,138 +1,164 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: torquebox-cache
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.1.2
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 2.2.0
 platform: java
-authors: 
-  - The TorqueBox Team
-autorequire: 
+authors:
+- The TorqueBox Team
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-09-24 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: activesupport
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 3.0.10
-    type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: i18n
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.5.0
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: torquebox-core
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.1.2
-    type: :runtime
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: torquebox-transactions
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.1.2
-    type: :runtime
-    version_requirements: *id004
-  - !ruby/object:Gem::Dependency 
-    name: json
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 1.4.6
-    type: :development
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.7.0
-    type: :development
-    version_requirements: *id006
-description: ""
-email: 
-  - torquebox-dev@torquebox.org
+date: 2012-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.10
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.10
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: i18n
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: torquebox-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: torquebox-transactions
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    none: false
+  prerelease: false
+  type: :development
+description: ''
+email:
+- torquebox-dev@torquebox.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - licenses/lgpl-2.1.txt
-  - lib/torquebox-cache.jar
-  - lib/torquebox-cache.rb
-  - lib/polyglot-cache-1.7.2.jar
-  - lib/polyglot-core-1.7.2.jar
-  - lib/cache.rb
-  - lib/cache_listener.rb
-  - lib/gem_hook.rb
-  - lib/sequence.rb
-  - lib/active_support/cache/torque_box_store.rb
-  - spec/spec_helper.rb
-  - spec/gem_hook_spec.rb
-  - spec/cache_spec.rb
-  - spec/cache_listener_spec.rb
-  - spec/torque_box_store_spec.rb
-  - spec/spec.opts
+files:
+- licenses/lgpl-2.1.txt
+- lib/torquebox-cache.jar
+- lib/torquebox-cache.rb
+- lib/polyglot-cache-1.10.0.jar
+- lib/polyglot-core-1.10.0.jar
+- lib/gem_hook.rb
+- lib/cache.rb
+- lib/sequence.rb
+- lib/cache_listener.rb
+- lib/active_support/cache/torque_box_store.rb
+- spec/cache_spec.rb
+- spec/gem_hook_spec.rb
+- spec/spec.opts
+- spec/cache_listener_spec.rb
+- spec/torque_box_store_spec.rb
+- spec/spec_helper.rb
 homepage: http://torquebox.org/
-licenses: 
-  - lgpl
-post_install_message: 
+licenses:
+- lgpl
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: TorqueBox Cache Gem
-test_files: 
-  - spec/gem_hook_spec.rb
-  - spec/cache_spec.rb
-  - spec/cache_listener_spec.rb
-  - spec/torque_box_store_spec.rb
+test_files:
+- spec/cache_spec.rb
+- spec/gem_hook_spec.rb
+- spec/cache_listener_spec.rb
+- spec/torque_box_store_spec.rb