Upgrade to latest WunderBoss release and WildFly 10.0.0.Final

The WunderBoss and WildFly upgrade also required some fairly hefty
changes to static content handling when running inside of WildFly. All
the integration tests pass, so confidence is high that things are
working properly.

Author: bbrowning

Rakefile

@@ -52,7 +52,7 @@ task 'build' do
     puts "  #{File.basename(gem)}: #{size_kb} KB"
   end
   puts "  Total: #{total_size_kb} KB"
-  max_size_kb = 10752
+  max_size_kb = 15360
   if total_size_kb > max_size_kb
     puts "ERROR: Maximum combined gem size of #{max_size_kb} KB exceeded"
     exit 1

caching/lib/torquebox/caching.rb

@@ -94,6 +94,9 @@ class << self
       # @return [Cache] The cache reference
       def cache(name, options = {})
         validate_options(options, VALID_OPTIONS)
+        if options[:max_entries].to_i > 0 && !options[:eviction]
+          options[:eviction] = :lru
+        end
         cache = component.find_or_create(name, extract_options(options, Caching::CreateOption))
         codec = Codecs[options.fetch(:encoding, :marshal_smart)]
         Cache.new(component.withCodec(cache, codec), options)

caching/spec/cache_spec.rb

@@ -422,21 +422,22 @@ def cache_on_disk(dir = nil, name = nil)
 
   describe "event notifications" do
     it "should add and remove cache listeners" do
+      num_orig_listeners = @cache.get_listeners.size
       l1 = @cache.add_listener(:cache_entry_loaded)
       l2 = @cache.add_listener(:cache_entry_visited, :cache_entry_removed)
       l1.size.should == 1
       l2.size.should == 2
-      @cache.get_listeners.size.should == 3
+      (@cache.get_listeners.size - num_orig_listeners).should == 3
       @cache.remove_listener(l1.first)
-      @cache.get_listeners.size.should == 2
+      (@cache.get_listeners.size - num_orig_listeners).should == 2
       @cache.get_listeners.each { |x| @cache.remove_listener(x) }
       @cache.get_listeners.size.should == 0
     end
 
     it "should reject bad event types" do
-      @cache.get_listeners.should be_empty
+      num_orig_listeners = @cache.get_listeners.size
       expect { @cache.add_listener(:cache_entry_visited, :this_should_barf) }.to raise_error(Java::JavaLang::IllegalArgumentException)
-      @cache.get_listeners.should be_empty
+      (@cache.get_listeners.size - num_orig_listeners).should == 0
     end
   end
 end

caching/torquebox-caching.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
 
   s.requirements << "jar org.projectodd.wunderboss:wunderboss-ruby, #{TorqueBox::WUNDERBOSS_VERSION}"
   s.requirements << "jar org.projectodd.wunderboss:wunderboss-caching, #{TorqueBox::WUNDERBOSS_VERSION}"
+  s.requirements << "jar org.projectodd.wunderboss:wunderboss-wildfly-caching, #{TorqueBox::WUNDERBOSS_VERSION}"
 end

core/ext/torquebox-core/org/torquebox/core/JarBuilder.java

@@ -189,8 +189,9 @@ protected void writeCurrentEntry(JarOutputStream jarOutput, InputStream value) t
     protected void writeCurrentEntry(JarOutputStream jarOutput, String name, List value) throws IOException {
         for (Object part : value) {
             writeCurrentEntry(jarOutput, name, part);
-            if (name.endsWith(".properties")) {
-                // duplicate .properties entries are joined by concatenating them together
+            if (name.endsWith(".properties") || name.contains("META-INF/services/")) {
+                // duplicate .properties and META-INF/services entries are
+                // joined by concatenating them together
                 writeCurrentEntry(jarOutput, new ByteArrayInputStream("\n".getBytes("UTF-8")));
             } else {
                 // for everything else, first entry added wins

core/lib/torquebox-core.rb

@@ -46,7 +46,7 @@ def list
 
   class << self
     def in_wildfly?
-      !org.projectodd.wunderboss.WunderBoss.options.get('wildfly-service').nil?
+      org.projectodd.wunderboss.WunderBoss.inWildFly()
     end
   end
 end

core/lib/torquebox/version.rb

@@ -15,6 +15,6 @@
 
 module TorqueBox
   VERSION = '4.0.0.beta3.dev'
-  WUNDERBOSS_VERSION = '0.8.x.incremental.4'
-  WILDFLY_VERSION = '9.0.1.Final'
+  WUNDERBOSS_VERSION = '0.12.1'
+  WILDFLY_VERSION = '10.0.0.Final'
 end

core/torquebox-core.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 2.14')
 
   s.requirements << "jar org.projectodd.wunderboss:wunderboss-ruby, #{TorqueBox::WUNDERBOSS_VERSION}"
-  s.requirements << "jar org.projectodd.wunderboss:wunderboss-wildfly, #{TorqueBox::WUNDERBOSS_VERSION}"
+  s.requirements << "jar org.projectodd.wunderboss:wunderboss-wildfly-core, #{TorqueBox::WUNDERBOSS_VERSION}"
 end

docs/caching.md

@@ -131,8 +131,12 @@ And if the `:persist` option is set, evicted entries are not deleted
 but rather flushed to disk so that the entries in memory are always a
 finite subset of those on disk.
 
-The default eviction policy is [:lirs], which is an optimized version
-of `:lru` (Least Recently Used).
+The default eviction policy is `:none`. Other options are `:lru`
+(Least Recently Used) and `:lirs`, which is an optimized but less
+predictable version of `:lru`.
+
+Setting a `:max_entries` option without also specifying an `:eviction`
+policy will result in the `:lru` policy being set for you.
 
     baz = TorqueBox::Caching.cache "baz", :max_entries => 3
     baz[:a] = 1
@@ -162,14 +166,11 @@ modified in the baz cache:
 
     result = baz.add_listener(:cache_entry_visited, :cache_entry_modified) {|e| puts e}
 
-    baz.get_listeners.size                        #=> 2
-
     # This should show two messages for each event (before/after)
     baz[:b] = baz[:b] + 1
 
-    # This should turn the notifications off
+    # This removes the listeners and turns the messages off
     result.each {|v| baz.remove_listener(v)}
-    baz.get_listeners.empty?                      #=> true
 
 ### Encoding
 

integration-tests/spec/alacarte_messaging_spec.rb

@@ -39,9 +39,13 @@
   def with_context(&block)
     type = wildfly? ? :hornetq_wildfly : :hornetq_standalone
     port = wildfly? ? 8080 : 5445
+    username = wildfly? ? "testuser" : nil
+    password = wildfly? ? "testuser1!" : nil
     TorqueBox::Messaging::Context.new(:host => "localhost",
                                       :port => port,
                                       :remote_type => type,
+                                      :username => username,
+                                      :password => password,
                                       &block)
   end
 end