Merge remote-tracking branch 'origin/10.1-dev'

Author: headius

core/src/main/java/org/jruby/ext/bigdecimal/BigDecimalLibrary.java

@@ -43,6 +43,6 @@ public void load(Ruby runtime, boolean wrap) throws IOException {
         RubyBigDecimal.createBigDecimal(context);
 
         // using load since this file does not exist in MRI
-        loadService(context).load("jruby/bigdecimal.rb", false);
+        loadService(context).loadFromClassLoader(Ruby.class.getClassLoader(), "jruby/bigdecimal.rb", false);
     }
 }// BigDecimalLibrary

core/src/main/java/org/jruby/javasupport/Java.java

@@ -139,7 +139,7 @@ public void load(Ruby runtime, boolean wrap) {
         RubyClass objectClass = (RubyClass) getProxyClass(context, java.lang.Object.class);
 
         // load Ruby parts of the 'java' library
-        loadService(context).load("jruby/java.rb", false);
+        loadService(context).loadFromClassLoader(Ruby.class.getClassLoader(), "jruby/java.rb", false);
 
         // rewire ArrayJavaProxy superclass to point at Object, so it inherits Object behaviors
         Access.getClass(context, "ArrayJavaProxy").

core/src/main/ruby/jruby/java.rb

@@ -34,5 +34,5 @@
 ###### END LICENSE BLOCK ######
 
 # These are loads so they don't pollute LOADED_FEATURES
-load 'jruby/java/core_ext.rb'
-load 'jruby/java/java_ext.rb'
+load 'uri:classloader:jruby/java/core_ext.rb'
+load 'uri:classloader:jruby/java/java_ext.rb'

core/src/main/ruby/jruby/java/core_ext.rb

@@ -1,4 +1,4 @@
 # Extensions to Ruby classes
 
 # These are loads so they don't pollute LOADED_FEATURES
-load 'jruby/java/core_ext/object.rb'
+load 'uri:classloader:jruby/java/core_ext/object.rb'

core/src/main/ruby/jruby/kernel.rb

@@ -7,28 +7,27 @@ module JRuby
 
 begin
   # Try to access ProcessBuilder; if it fails, don't define our special process logic
-  load 'jruby/kernel/jruby/process_manager.rb'
+  load 'uri:classloader:jruby/kernel/jruby/process_manager.rb'
 rescue Exception # java.lang.ProcessBuilder not available
   warn "ProcessBuilder unavailable; using default backtick" if $VERBOSE
   JRuby.send(:remove_const, :ProcessManager) rescue nil
   # leave old backtick logic in place
 end unless JRuby::Util.native_posix? # native POSIX uses new logic for back-quote
 
 # These are loads so they don't pollute LOADED_FEATURES
-load 'jruby/kernel/signal.rb'
-load 'jruby/kernel/kernel.rb'
-load 'jruby/kernel/proc.rb'
-load 'jruby/kernel/process.rb'
-load 'jruby/kernel/enumerator.rb'
-load 'jruby/kernel/enumerable.rb'
-load 'jruby/kernel/io.rb'
-load 'jruby/kernel/gc.rb'
-load 'jruby/kernel/range.rb'
-load 'jruby/kernel/file.rb'
-load 'jruby/kernel/method.rb'
-load 'jruby/kernel/thread.rb'
-load 'jruby/kernel/integer.rb'
-load 'jruby/kernel/time.rb'
-load 'jruby/kernel/set.rb'
-load 'jruby/kernel/string.rb'
-load 'jruby/kernel/pathname.rb'
+load 'uri:classloader:jruby/kernel/signal.rb'
+load 'uri:classloader:jruby/kernel/kernel.rb'
+load 'uri:classloader:jruby/kernel/proc.rb'
+load 'uri:classloader:jruby/kernel/process.rb'
+load 'uri:classloader:jruby/kernel/enumerator.rb'
+load 'uri:classloader:jruby/kernel/enumerable.rb'
+load 'uri:classloader:jruby/kernel/io.rb'
+load 'uri:classloader:jruby/kernel/gc.rb'
+load 'uri:classloader:jruby/kernel/range.rb'
+load 'uri:classloader:jruby/kernel/file.rb'
+load 'uri:classloader:jruby/kernel/method.rb'
+load 'uri:classloader:jruby/kernel/thread.rb'
+load 'uri:classloader:jruby/kernel/integer.rb'
+load 'uri:classloader:jruby/kernel/time.rb'
+load 'uri:classloader:jruby/kernel/string.rb'
+load 'uri:classloader:jruby/kernel/pathname.rb'

core/src/main/ruby/jruby/preludes.rb

@@ -1,3 +1,3 @@
 # Load preludes
-load 'jruby/kernel/prelude.rb'
-load 'jruby/kernel/gem_prelude.rb'
+load 'uri:classloader:/jruby/kernel/prelude.rb'
+load 'uri:classloader:/jruby/kernel/gem_prelude.rb'