Fixed bad Java compile task.

Author: jdantonio

README.md

@@ -192,6 +192,7 @@ any platform. *Documentation is forthcoming...*
 ```
 *MRI only*
 rake build:native       # Build concurrent-ruby-ext-<version>-<platform>.gem into the pkg directory
+rake compile:extension  # Compile extension
 
 *JRuby only*
 rake build              # Build JRuby-specific core gem (alias for `build:core`)
@@ -206,7 +207,6 @@ rake build:ext          # Build concurrent-ruby-ext-<version>.gem into the pkg d
 rake clean              # Remove any temporary products
 rake clobber            # Remove any generated file
 rake compile            # Compile all the extensions
-rake compile:extension  # Compile extension
 ```
 
 ## Maintainers

Rakefile

@@ -10,6 +10,7 @@ EXT_GEMSPEC = Gem::Specification.load('concurrent-ruby-ext.gemspec')
 
 GEM_NAME = 'concurrent-ruby'
 EXTENSION_NAME = 'extension'
+JAVA_EXT_NAME = 'concurrent_ruby_ext'
 
 if Concurrent.jruby?
   CORE_GEM = "#{GEM_NAME}-#{Concurrent::VERSION}-java.gem"
@@ -39,7 +40,7 @@ if Concurrent.jruby?
   ## create the compile task for the JRuby-specific gem
   require 'rake/javaextensiontask'
 
-  Rake::JavaExtensionTask.new('java', CORE_GEMSPEC) do |ext|
+  Rake::JavaExtensionTask.new(JAVA_EXT_NAME, CORE_GEMSPEC) do |ext|
     ext.ext_dir = 'ext'
   end
 

concurrent-ruby.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths    = ['lib']
 
   if defined?(JRUBY_VERSION)
-    s.files += Dir['lib/concurrent_ruby_ext.jar']
+    s.files += Dir['lib/**/*.jar']
     s.platform = 'java'
   else
     s.add_runtime_dependency 'ref', '~> 1.0', '>= 1.0.5'

lib/extension_helper.rb

@@ -28,10 +28,10 @@ def self.jruby?
     end
   elsif jruby? && !@@java_ext_loaded
     begin
-      require 'concurrent/extension'
+      require 'concurrent_ruby_ext'
       @@java_ext_loaded = true
     rescue LoadError
-      #warn 'Attempted to load Java extensions on unsupported platform. Continuing with pure-Ruby.'
+      warn 'Attempted to load Java extensions on unsupported platform. Continuing with pure-Ruby.'
     end
   end
 end