torquebox-cache 2.1.2-java → 2.2.0-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. data/lib/active_support/cache/torque_box_store.rb +2 -0
  2. data/lib/cache.rb +14 -14
  3. data/lib/{polyglot-cache-1.7.2.jar → polyglot-cache-1.10.0.jar} +0 -0
  4. data/lib/{polyglot-core-1.7.2.jar → polyglot-core-1.10.0.jar} +0 -0
  5. data/lib/torquebox-cache.jar +0 -0
  6. data/lib/torquebox-cache.rb +4 -4
  7. data/spec/torque_box_store_spec.rb +1 -1
  8. metadata +149 -123
data/lib/active_support/cache/torque_box_store.rb CHANGED
@@ -19,8 +19,10 @@ require 'active_support/cache'
19
19
  require 'torquebox/kernel'
20
20
  require 'cache'
21
21
 
22
+ # @api private
22
23
  module ActiveSupport
23
24
  module Cache
25
+ # @api public
24
26
  class TorqueBoxStore < Store
25
27
 
26
28
  SECONDS = java.util.concurrent.TimeUnit::SECONDS
data/lib/cache.rb CHANGED
@@ -23,6 +23,7 @@ require 'sequence'
23
23
  module TorqueBox
24
24
  module Infinispan
25
25
 
26
+ # @api private
26
27
  class ContainerTransactionManagerLookup
27
28
  include TorqueBox::Injectors
28
29
  begin
@@ -51,7 +52,8 @@ module TorqueBox
51
52
 
52
53
  SECONDS = java.util.concurrent.TimeUnit::SECONDS
53
54
  begin
54
- java_import org.infinispan.config.Configuration::CacheMode
55
+ java_import org.infinispan.configuration.cache::CacheMode
56
+ java_import org.infinispan.configuration.cache::ConfigurationBuilder
55
57
  java_import org.infinispan.transaction::TransactionMode
56
58
  java_import org.infinispan.transaction::LockingMode
57
59
  java_import org.projectodd.polyglot.cache.as::CacheService
@@ -275,31 +277,29 @@ module TorqueBox
275
277
 
276
278
  def reconfigure(mode=clustering_mode)
277
279
  existing_cache = manager.get_cache(name)
278
- base_config = existing_cache.configuration
279
- unless base_config.cache_mode == mode
280
+ base_config = existing_cache.cache_configuration
281
+ unless base_config.clustering.cache_mode == mode
280
282
  log( "Reconfiguring Infinispan cache #{name} from #{base_config.cache_mode} to #{mode}" )
281
- existing_cache .stop
283
+ existing_cache.stop
282
284
  configure(mode)
283
- existing_cache .start
285
+ existing_cache.start
284
286
  end
285
- return existing_cache
287
+ return existing_cache
286
288
  end
287
289
 
288
290
  def configure(mode=clustering_mode)
289
291
  log( "Configuring Infinispan cache #{name} as #{mode}" )
290
- base_config = manager.default_configuration.clone
291
- base_config.cache_mode = mode
292
- config = base_config.fluent
292
+ config = ConfigurationBuilder.new.read( manager.default_cache_configuration )
293
+ config.clustering.cacheMode( mode )
293
294
  config.transaction.transactionMode( transaction_mode )
294
295
  if transactional?
295
- config.transaction.transactionManagerLookup( transaction_manager_lookup )
296
+ config.transaction.transactionManagerLookup( transaction_manager_lookup )
296
297
  config.transaction.lockingMode( locking_mode )
297
298
  end
298
299
  if persisted?
299
- store = org.infinispan.loaders.file.FileCacheStoreConfig.new
300
- store.purge_on_startup( false )
301
- store.location(options[:persist]) if File.exist?( options[:persist].to_s )
302
- config.loaders.add_cache_loader( store )
300
+ store = config.loaders.add_file_cache_store
301
+ store.purgeOnStartup( false )
302
+ store.location(options[:persist]) if File.exist?( options[:persist].to_s )
303
303
  end
304
304
  manager.define_configuration(name, config.build )
305
305
  manager.get_cache(name)
data/lib/torquebox-cache.jar CHANGED
Binary file
data/lib/torquebox-cache.rb CHANGED
@@ -1,12 +1,12 @@
1
1
  module TorqueboxCache
2
- VERSION = '2.1.2'
3
- MAVEN_VERSION = '2.1.2'
2
+ VERSION = '2.2.0'
3
+ MAVEN_VERSION = '2.2.0'
4
4
  end
5
5
  begin
6
6
  require 'java'
7
7
  require File.dirname(__FILE__) + '/torquebox-cache.jar'
8
- require File.dirname(__FILE__) + '/polyglot-cache-1.7.2.jar'
9
- require File.dirname(__FILE__) + '/polyglot-core-1.7.2.jar'
8
+ require File.dirname(__FILE__) + '/polyglot-cache-1.10.0.jar'
9
+ require File.dirname(__FILE__) + '/polyglot-core-1.10.0.jar'
10
10
  rescue LoadError
11
11
  puts 'JAR-based gems require JRuby to load. Please visit www.jruby.org.'
12
12
  raise
data/spec/torque_box_store_spec.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'active_support/cache/torque_box_store'
2
2
  require 'logger'
3
3
 
4
- java_import org.infinispan.config.Configuration::CacheMode
4
+ java_import org.infinispan.configuration.cache::CacheMode
5
5
  include ActiveSupport::Cache
6
6
 
7
7
  TORQUEBOX_APP_NAME = 'active-support-unit-test'
metadata CHANGED
@@ -1,138 +1,164 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: torquebox-cache
3
- version: !ruby/object:Gem::Version
4
- prerelease:
5
- version: 2.1.2
3
+ version: !ruby/object:Gem::Version
4
+ prerelease:
5
+ version: 2.2.0
6
6
  platform: java
7
- authors:
8
- - The TorqueBox Team
9
- autorequire:
7
+ authors:
8
+ - The TorqueBox Team
9
+ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
-
13
- date: 2012-09-24 00:00:00 Z
14
- dependencies:
15
- - !ruby/object:Gem::Dependency
16
- name: activesupport
17
- prerelease: false
18
- requirement: &id001 !ruby/object:Gem::Requirement
19
- none: false
20
- requirements:
21
- - - "="
22
- - !ruby/object:Gem::Version
23
- version: 3.0.10
24
- type: :development
25
- version_requirements: *id001
26
- - !ruby/object:Gem::Dependency
27
- name: i18n
28
- prerelease: false
29
- requirement: &id002 !ruby/object:Gem::Requirement
30
- none: false
31
- requirements:
32
- - - "="
33
- - !ruby/object:Gem::Version
34
- version: 0.5.0
35
- type: :development
36
- version_requirements: *id002
37
- - !ruby/object:Gem::Dependency
38
- name: torquebox-core
39
- prerelease: false
40
- requirement: &id003 !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - "="
44
- - !ruby/object:Gem::Version
45
- version: 2.1.2
46
- type: :runtime
47
- version_requirements: *id003
48
- - !ruby/object:Gem::Dependency
49
- name: torquebox-transactions
50
- prerelease: false
51
- requirement: &id004 !ruby/object:Gem::Requirement
52
- none: false
53
- requirements:
54
- - - "="
55
- - !ruby/object:Gem::Version
56
- version: 2.1.2
57
- type: :runtime
58
- version_requirements: *id004
59
- - !ruby/object:Gem::Dependency
60
- name: json
61
- prerelease: false
62
- requirement: &id005 !ruby/object:Gem::Requirement
63
- none: false
64
- requirements:
65
- - - "="
66
- - !ruby/object:Gem::Version
67
- version: 1.4.6
68
- type: :development
69
- version_requirements: *id005
70
- - !ruby/object:Gem::Dependency
71
- name: rspec
72
- prerelease: false
73
- requirement: &id006 !ruby/object:Gem::Requirement
74
- none: false
75
- requirements:
76
- - - "="
77
- - !ruby/object:Gem::Version
78
- version: 2.7.0
79
- type: :development
80
- version_requirements: *id006
81
- description: ""
82
- email:
83
- - torquebox-dev@torquebox.org
12
+ date: 2012-12-06 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
15
+ name: activesupport
16
+ version_requirements: !ruby/object:Gem::Requirement
17
+ requirements:
18
+ - - '='
19
+ - !ruby/object:Gem::Version
20
+ version: 3.0.10
21
+ none: false
22
+ requirement: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - '='
25
+ - !ruby/object:Gem::Version
26
+ version: 3.0.10
27
+ none: false
28
+ prerelease: false
29
+ type: :development
30
+ - !ruby/object:Gem::Dependency
31
+ name: i18n
32
+ version_requirements: !ruby/object:Gem::Requirement
33
+ requirements:
34
+ - - '='
35
+ - !ruby/object:Gem::Version
36
+ version: 0.5.0
37
+ none: false
38
+ requirement: !ruby/object:Gem::Requirement
39
+ requirements:
40
+ - - '='
41
+ - !ruby/object:Gem::Version
42
+ version: 0.5.0
43
+ none: false
44
+ prerelease: false
45
+ type: :development
46
+ - !ruby/object:Gem::Dependency
47
+ name: torquebox-core
48
+ version_requirements: !ruby/object:Gem::Requirement
49
+ requirements:
50
+ - - '='
51
+ - !ruby/object:Gem::Version
52
+ version: 2.2.0
53
+ none: false
54
+ requirement: !ruby/object:Gem::Requirement
55
+ requirements:
56
+ - - '='
57
+ - !ruby/object:Gem::Version
58
+ version: 2.2.0
59
+ none: false
60
+ prerelease: false
61
+ type: :runtime
62
+ - !ruby/object:Gem::Dependency
63
+ name: torquebox-transactions
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - '='
67
+ - !ruby/object:Gem::Version
68
+ version: 2.2.0
69
+ none: false
70
+ requirement: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - '='
73
+ - !ruby/object:Gem::Version
74
+ version: 2.2.0
75
+ none: false
76
+ prerelease: false
77
+ type: :runtime
78
+ - !ruby/object:Gem::Dependency
79
+ name: json
80
+ version_requirements: !ruby/object:Gem::Requirement
81
+ requirements:
82
+ - - '='
83
+ - !ruby/object:Gem::Version
84
+ version: 1.4.6
85
+ none: false
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - '='
89
+ - !ruby/object:Gem::Version
90
+ version: 1.4.6
91
+ none: false
92
+ prerelease: false
93
+ type: :development
94
+ - !ruby/object:Gem::Dependency
95
+ name: rspec
96
+ version_requirements: !ruby/object:Gem::Requirement
97
+ requirements:
98
+ - - '='
99
+ - !ruby/object:Gem::Version
100
+ version: 2.7.0
101
+ none: false
102
+ requirement: !ruby/object:Gem::Requirement
103
+ requirements:
104
+ - - '='
105
+ - !ruby/object:Gem::Version
106
+ version: 2.7.0
107
+ none: false
108
+ prerelease: false
109
+ type: :development
110
+ description: ''
111
+ email:
112
+ - torquebox-dev@torquebox.org
84
113
  executables: []
85
-
86
114
  extensions: []
87
-
88
115
  extra_rdoc_files: []
89
-
90
- files:
91
- - licenses/lgpl-2.1.txt
92
- - lib/torquebox-cache.jar
93
- - lib/torquebox-cache.rb
94
- - lib/polyglot-cache-1.7.2.jar
95
- - lib/polyglot-core-1.7.2.jar
96
- - lib/cache.rb
97
- - lib/cache_listener.rb
98
- - lib/gem_hook.rb
99
- - lib/sequence.rb
100
- - lib/active_support/cache/torque_box_store.rb
101
- - spec/spec_helper.rb
102
- - spec/gem_hook_spec.rb
103
- - spec/cache_spec.rb
104
- - spec/cache_listener_spec.rb
105
- - spec/torque_box_store_spec.rb
106
- - spec/spec.opts
116
+ files:
117
+ - licenses/lgpl-2.1.txt
118
+ - lib/torquebox-cache.jar
119
+ - lib/torquebox-cache.rb
120
+ - lib/polyglot-cache-1.10.0.jar
121
+ - lib/polyglot-core-1.10.0.jar
122
+ - lib/gem_hook.rb
123
+ - lib/cache.rb
124
+ - lib/sequence.rb
125
+ - lib/cache_listener.rb
126
+ - lib/active_support/cache/torque_box_store.rb
127
+ - spec/cache_spec.rb
128
+ - spec/gem_hook_spec.rb
129
+ - spec/spec.opts
130
+ - spec/cache_listener_spec.rb
131
+ - spec/torque_box_store_spec.rb
132
+ - spec/spec_helper.rb
107
133
  homepage: http://torquebox.org/
108
- licenses:
109
- - lgpl
110
- post_install_message:
134
+ licenses:
135
+ - lgpl
136
+ post_install_message:
111
137
  rdoc_options: []
112
-
113
- require_paths:
114
- - lib
115
- required_ruby_version: !ruby/object:Gem::Requirement
138
+ require_paths:
139
+ - lib
140
+ required_ruby_version: !ruby/object:Gem::Requirement
141
+ requirements:
142
+ - - ! '>='
143
+ - !ruby/object:Gem::Version
144
+ version: !binary |-
145
+ MA==
116
146
  none: false
117
- requirements:
118
- - - ">="
119
- - !ruby/object:Gem::Version
120
- version: "0"
121
- required_rubygems_version: !ruby/object:Gem::Requirement
147
+ required_rubygems_version: !ruby/object:Gem::Requirement
148
+ requirements:
149
+ - - ! '>='
150
+ - !ruby/object:Gem::Version
151
+ version: !binary |-
152
+ MA==
122
153
  none: false
123
- requirements:
124
- - - ">="
125
- - !ruby/object:Gem::Version
126
- version: "0"
127
154
  requirements: []
128
-
129
- rubyforge_project:
155
+ rubyforge_project:
130
156
  rubygems_version: 1.8.24
131
- signing_key:
157
+ signing_key:
132
158
  specification_version: 3
133
159
  summary: TorqueBox Cache Gem
134
- test_files:
135
- - spec/gem_hook_spec.rb
136
- - spec/cache_spec.rb
137
- - spec/cache_listener_spec.rb
138
- - spec/torque_box_store_spec.rb
160
+ test_files:
161
+ - spec/cache_spec.rb
162
+ - spec/gem_hook_spec.rb
163
+ - spec/cache_listener_spec.rb
164
+ - spec/torque_box_store_spec.rb