Move builtin/kernel* stuff to jruby/kernel*.

Author: headius

src/builtin/kernel.rb

@@ -0,0 +1,6 @@
+# This is the primary kernel file, containing loads for subkernels that are
+# common to all supported versions of Ruby. Subsequent version-specific kernel
+# loads are expected to add and patch the behaviors loaded by this file.
+
+# These are loads so they don't pollute LOADED_FEATURES
+load 'jruby/kernel/generator.rb'

src/builtin/kernel18.rb

@@ -0,0 +1,4 @@
+# This is the Ruby 1.8.7-specific kernel file.
+
+# These are loads so they don't pollute LOADED_FEATURES
+load 'jruby/kernel18/enumerator.rb'

src/builtin/kernel19.rb

@@ -0,0 +1,15 @@
+# This is the Ruby 1.9-specific kernel file.
+
+# Thread features are always available in 1.9.
+require 'thread.jar'
+
+# These are loads so they don't pollute LOADED_FEATURES
+load 'jruby/kernel19/mutex.rb'
+load 'jruby/kernel19/thread.rb'
+load 'jruby/kernel19/kernel.rb'
+load 'jruby/kernel19/proc.rb'
+load 'jruby/kernel19/process.rb'
+load 'jruby/kernel19/jruby/process_util.rb'
+load 'jruby/kernel19/enumerator.rb'
+load 'jruby/kernel19/enumerable.rb'
+load 'jruby/kernel19/rubygems.rb' unless JRuby::CONFIG.rubygems_disabled?

src/jruby/kernel.rb

@@ -1552,14 +1552,14 @@ public void load(Ruby runtime, boolean wrap) throws IOException {
 
     private void initRubyKernel() {
         // load Ruby parts of core
-        loadFile("builtin/kernel.rb", getJRubyClassLoader().getResourceAsStream("builtin/kernel.rb"), false);
+        loadFile("jruby/kernel.rb", getJRubyClassLoader().getResourceAsStream("jruby/kernel.rb"), false);
 
         switch (config.getCompatVersion()) {
             case RUBY1_8:
-                loadFile("builtin/kernel18.rb", getJRubyClassLoader().getResourceAsStream("builtin/kernel18.rb"), false);
+                loadFile("jruby/kernel18.rb", getJRubyClassLoader().getResourceAsStream("jruby/kernel18.rb"), false);
                 break;
             case RUBY1_9:
-                loadFile("builtin/kernel19.rb", getJRubyClassLoader().getResourceAsStream("builtin/kernel19.rb"), false);
+                loadFile("jruby/kernel19.rb", getJRubyClassLoader().getResourceAsStream("jruby/kernel19.rb"), false);
                 break;
         }
     }