Permalink
Browse files

Upgrade to AS 7.1.3.Final (or as near as we can get)

  • Loading branch information...
1 parent b44e04a commit e85d0a786d0d54b3dcdc31aab844963b62343800 @bbrowning bbrowning committed Sep 28, 2012
Showing with 19 additions and 18 deletions.
  1. +13 −14 gems/cache/lib/cache.rb
  2. +1 −1 gems/cache/spec/torque_box_store_spec.rb
  3. +2 −0 integration-tests/bin/setup-integ-dist.rb
  4. +3 −3 pom.xml
View
@@ -51,7 +51,8 @@ class Cache
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 +276,29 @@ def manager
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)
@@ -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'
@@ -38,3 +38,5 @@
FileUtils.rm_rf( Dir["#{output_dir}/jboss/standalone/log/*"] )
FileUtils.rm_rf( Dir["#{output_dir}/jboss/standalone/deployments/*"] )
+FileUtils.rm_rf( Dir["#{output_dir}/jboss/domain/servers/server-01/log/*"] )
+FileUtils.rm_rf( Dir["#{output_dir}/jboss/domain/servers/server-02/log/*"] )
View
@@ -628,7 +628,7 @@
<properties>
<ruby.compat.version>1.8</ruby.compat.version>
- <version.polyglot>1.7.4-SNAPSHOT</version.polyglot>
+ <version.polyglot>1.8.0-SNAPSHOT</version.polyglot>
<version.jruby-maven-plugins>0.28.4</version.jruby-maven-plugins>
<version.junit>4.7</version.junit>
<version.jmock>2.5.1</version.jmock>
@@ -662,13 +662,13 @@
<version.rspec>2.7.0</version.rspec>
<version.newrelic>3.3.2</version.newrelic>
- <version.jbossas>7.1.x.incremental.1</version.jbossas>
+ <version.jbossas>7.1.x.incremental.107</version.jbossas>
<version.org.projectodd.stilts>0.1.28</version.org.projectodd.stilts>
<version.org.projectodd.yaml-schema>0.2</version.org.projectodd.yaml-schema>
<version.org.hibernate.search>4.1.0.Beta1</version.org.hibernate.search>
- <version.org.infinispan>5.1.1.FINAL</version.org.infinispan>
+ <version.org.infinispan>5.1.7.FINAL</version.org.infinispan>
<version.org.jboss.jboss-msc>1.0.2.GA</version.org.jboss.jboss-msc>
</properties>

0 comments on commit e85d0a7

Please sign in to comment.