jruby
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -3307,7 +3307,7 @@ public void tearDown(boolean systemExit) {
 
         getSelectorPool().cleanup();
 
-        tearDownClassLoader();
+        releaseClassLoader();
 
         if (config.isProfilingEntireRun()) {
             // not using logging because it's formatted
@@ -3332,9 +3332,9 @@ public void tearDown(boolean systemExit) {
         }
     }
 
-    private void tearDownClassLoader() {
+    private void releaseClassLoader() {
         if (getJRubyClassLoader() != null) {
-            getJRubyClassLoader().tearDown(isDebug());
+            getJRubyClassLoader().close();
         }
     }
 

diff --git a/core/src/main/java/org/jruby/RubyDir.java b/core/src/main/java/org/jruby/RubyDir.java
@@ -84,6 +84,8 @@ public class RubyDir extends RubyObject {
 
     private final static Encoding UTF8 = UTF8Encoding.INSTANCE;
 
+    private static Pattern PROTOCOL_PATTERN = Pattern.compile("^(uri|jar|file|classpath):([^:]*:)?//?.*");
+
     public RubyDir(Ruby runtime, RubyClass type) {
         super(runtime, type);
     }
@@ -308,7 +310,7 @@ public static IRubyObject chdir(ThreadContext context, IRubyObject recv, IRubyOb
         checkDirIsTwoSlashesOnWindows(runtime, adjustedPath);
         String realPath = null;
         String oldCwd = runtime.getCurrentDirectory();
-        if (adjustedPath.startsWith("uri:")){
+        if (PROTOCOL_PATTERN.matcher(adjustedPath).matches()) {
             realPath = adjustedPath;
         }
         else {

diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -1540,16 +1540,18 @@ private static IRubyObject expandPathInternal(ThreadContext context, IRubyObject
         // argument is relative.
         if (args.length == 2 && !args[1].isNil()) {
             // TODO maybe combine this with get_path method
-            if ((args[1] instanceof RubyString) && args[1].asJavaString().startsWith("uri:")) {
-                cwd = args[1].asJavaString();
+            String path = args[1].toString();
+            if (path.startsWith("uri:")) {
+                cwd = path;
             } else {
                 cwd = StringSupport.checkEmbeddedNulls(runtime, get_path(context, args[1])).getUnicodeValue();
 
                 // Handle ~user paths.
                 if (expandUser) {
                     cwd = expandUserPath(context, cwd, true);
                 }
-
+
+                // TODO try to treat all uri-like paths alike
                 String[] cwdURIParts = splitURI(cwd);
                 if (uriParts == null && cwdURIParts != null) {
                     uriParts = cwdURIParts;
@@ -1566,7 +1568,8 @@ private static IRubyObject expandPathInternal(ThreadContext context, IRubyObject
                 // If the path isn't absolute, then prepend the current working
                 // directory to the path.
                 if (!startsWithSlashNotOnWindows && !startsWithDriveLetterOnWindows(cwd)) {
-                    cwd = new File(runtime.getCurrentDirectory(), cwd).getAbsolutePath();
+                    if ("".equals(cwd)) cwd = ".";
+                    cwd = JRubyFile.create(runtime.getCurrentDirectory(), cwd).getAbsolutePath();
                 }
             }
         } else {

diff --git a/core/src/main/java/org/jruby/RubyInstanceConfig.java b/core/src/main/java/org/jruby/RubyInstanceConfig.java
@@ -53,9 +53,7 @@
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -70,8 +68,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 import java.util.regex.Pattern;
 
 /**
@@ -1756,8 +1752,6 @@ public boolean shouldPrecompileAll() {
 
     public static final boolean JIT_CACHE_ENABLED = Options.JIT_CACHE.load();
 
-    public static final String JIT_CODE_CACHE = Options.JIT_CODECACHE.load();
-
     public static final boolean REFLECTED_HANDLES = Options.REFLECTED_HANDLES.load();
 
     public static final boolean NO_UNWRAP_PROCESS_STREAMS = Options.PROCESS_NOUNWRAP.load();
@@ -1947,4 +1941,5 @@ public boolean isCextEnabled() {
         return false;
     }
 
+    @Deprecated public static final String JIT_CODE_CACHE = "";
 }
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -148,8 +148,8 @@ public class RubyThread extends RubyObject implements ExecutionContext {
     private final SleepTask2 sleepTask = new SleepTask2();
 
     private static final boolean DEBUG = false;
-    private static final int RUBY_MIN_THREAD_PRIORITY = -3;
-    private static final int RUBY_MAX_THREAD_PRIORITY = 3;
+    public static final int RUBY_MIN_THREAD_PRIORITY = -3;
+    public static final int RUBY_MAX_THREAD_PRIORITY = 3;
 
     /** Thread statuses */
     public static enum Status { 
@@ -1106,26 +1106,19 @@ public IRubyObject priority_set(IRubyObject priority) {
         return RubyFixnum.newFixnum(getRuntime(), iPriority);
     }
 
-    /* helper methods to translate java thread priority (1-10) to
-     * Ruby thread priority (-3 to 3) using a quadratic polynoimal ant its
-     * inverse
+    /* helper methods to translate Java thread priority (1-10) to
+     * Ruby thread priority (-3 to 3) using a quadratic polynomial ant its
+     * inverse passing by (Ruby,Java): (-3,1), (0,5) and (3,10)
      * i.e., j = r^2/18 + 3*r/2 + 5
      *       r = 3/2*sqrt(8*j + 41) - 27/2
      */
-    private int javaPriorityToRubyPriority(int javaPriority) {
-        double d; // intermediate value
-        d = 1.5 * Math.sqrt(8.0*javaPriority + 41) - 13.5;
+    public static int javaPriorityToRubyPriority(int javaPriority) {
+        double d = 1.5 * Math.sqrt(8.0 * javaPriority + 41) - 13.5;
         return Math.round((float) d);
     }
-
-    private int rubyPriorityToJavaPriority(int rubyPriority) {
-        double d;
-        if (rubyPriority < RUBY_MIN_THREAD_PRIORITY) {
-            rubyPriority = RUBY_MIN_THREAD_PRIORITY;
-        } else if (rubyPriority > RUBY_MAX_THREAD_PRIORITY) {
-            rubyPriority = RUBY_MAX_THREAD_PRIORITY;
-        }
-        d = Math.pow(rubyPriority, 2.0)/18.0 + 1.5 * rubyPriority + 5;
+
+    public static int rubyPriorityToJavaPriority(int rubyPriority) {
+        double d = (rubyPriority * rubyPriority) / 18.0 + 1.5 * rubyPriority + 5;
         return Math.round((float) d);
     }
 

diff --git a/core/src/main/java/org/jruby/compiler/JITCompiler.java b/core/src/main/java/org/jruby/compiler/JITCompiler.java
@@ -13,7 +13,7 @@
  *
  * Copyright (C) 2006-2008 Charles O Nutter <headius@headius.com>
  * Copyright (C) 2008 Thomas E Enebo <enebo@acm.org>
- * 
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -84,10 +84,10 @@ public static class JITCounts {
 
     private final JITCounts counts = new JITCounts();
     private final ExecutorService executor;
-    
+
     private final Ruby runtime;
     private final RubyInstanceConfig config;
-    
+
     public JITCompiler(Ruby runtime) {
         this.runtime = runtime;
         this.config = runtime.getInstanceConfig();
@@ -120,19 +120,19 @@ public long getCompileTime() {
     public long getAbandonCount() {
         return counts.abandonCount.get();
     }
-    
+
     public long getCodeSize() {
         return counts.codeSize.get();
     }
-    
+
     public long getAverageCodeSize() {
         return counts.averageCodeSize.get();
     }
-    
+
     public long getAverageCompileTime() {
         return counts.averageCompileTime.get() / 1000;
     }
-    
+
     public long getLargestCodeSize() {
         return counts.largestCodeSize.get();
     }
@@ -334,7 +334,7 @@ public static String getHashForBytes(byte[] bytes) {
             throw new RuntimeException(nsae);
         }
     }
-    
+
     public static class JITClassGenerator {
         public JITClassGenerator(String className, String methodName, String key, Ruby ruby, MixedModeIRMethod method, JVMVisitor visitor) {
             this.packageName = JITCompiler.RUBY_JIT_PREFIX;
@@ -345,7 +345,7 @@ public JITClassGenerator(String className, String methodName, String key, Ruby r
                 // Also, invokedynamic forces us to make jitted bytecode unique to each runtime, since the call sites cache
                 // at class level rather than at our runtime level. This makes it impossible to share jitted bytecode
                 // across runtimes.
-                
+
                 digestString = key + Math.abs(ruby.hashCode());
             } else {
                 digestString = key;
@@ -356,11 +356,11 @@ public JITClassGenerator(String className, String methodName, String key, Ruby r
             this.method = method;
             this.visitor = visitor;
         }
-        
+
         @SuppressWarnings("unchecked")
         protected void compile() {
             if (bytecode != null) return;
-            
+
             // Time the compilation
             long start = System.nanoTime();
 
@@ -395,7 +395,7 @@ void updateCounters(JITCounts counts) {
         public void generate() {
             compile();
         }
-        
+
         public byte[] bytecode() {
             return bytecode;
         }
@@ -429,15 +429,15 @@ static void log(RubyModule implementationClass, String file, int line, String na
         name = isBlock ? "" : "." + name;
 
         StringBuilder builder = new StringBuilder(message + ":" + className + name + " at " + file + ":" + line);
-        
+
         if (reason.length > 0) {
             builder.append(" because of: \"");
             for (int i = 0; i < reason.length; i++) {
                 builder.append(reason[i]);
             }
             builder.append('"');
         }
-        
+
         LOG.info(builder.toString());
     }
 }
diff --git a/core/src/main/java/org/jruby/embed/IsolatedScriptingContainer.java b/core/src/main/java/org/jruby/embed/IsolatedScriptingContainer.java
@@ -4,22 +4,26 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.List;
+import java.util.LinkedList;
+
+import org.jruby.util.UriLikePathHelper;
 
 /**
  * the IsolatedScriptingContainer does set GEM_HOME and GEM_PATH and JARS_HOME
  * in such a way that it uses only resources which can be reached with classloader.
- * 
+ *
  * GEM_HOME is uri:classloader://META-INF/jruby.home/lib/ruby/gems/shared
  * GEM_PATH is uri:classloader://
  * JARS_HOME is uri:classloader://jars
- * 
+ *
  * but whenever you want to set them via {@link #setEnvironment(Map)} this will be honored.
- * 
+ *
  * it also comes with OSGi support which allows to add a bundle to LOAD_PATH or GEM_PATH.
  */
 public class IsolatedScriptingContainer extends ScriptingContainer {
 
-    private static final String JRUBY_HOME = "/META-INF/jruby.home";
+    private static final String URI_CLASSLOADER = "uri:classloader:/";
 
     public IsolatedScriptingContainer()
     {
@@ -48,20 +52,29 @@ public IsolatedScriptingContainer( LocalContextScope scope,
     {
         super(scope, behavior, lazy);
 
-        setLoadPaths( Arrays.asList( "uri:classloader:" ) );
+        List<String> loadPaths = new LinkedList<String>();
+        loadPaths.add(URI_CLASSLOADER);
+        setLoadPaths(loadPaths);
+
+        // set the right jruby home
+        UriLikePathHelper uriPath = new UriLikePathHelper(getClassLoader());
+        URL url = uriPath.getResource("/.jrubydir");
+        if (url != null){
+            setCurrentDirectory( URI_CLASSLOADER );
+        }
 
         // setup the isolated GEM_PATH, i.e. without $HOME/.gem/**
         setEnvironment(null);
     }
 
     @Override
     public void setEnvironment(Map environment) {
-        if (environment == null || !environment.containsKey("GEM_PATH") 
-                || !environment.containsKey("GEM_HOME")|| !environment.containsKey("JARS_HOME")) {
+        if (environment == null || !environment.containsKey("GEM_PATH")
+                || !environment.containsKey("GEM_HOME") || !environment.containsKey("JARS_HOME")) {
             Map<String,String> env = environment == null ? new HashMap<String,String>() : new HashMap<String,String>(environment);
-            if (!env.containsKey("GEM_PATH")) env.put("GEM_PATH", "uri:classloader://");
-            if (!env.containsKey("GEM_HOME")) env.put("GEM_HOME", "uri:classloader://");
-            if (!env.containsKey("JARS_HOME")) env.put("JARS_HOME", "uri:classloader://jars");
+            if (!env.containsKey("GEM_PATH")) env.put("GEM_PATH", URI_CLASSLOADER);
+            if (!env.containsKey("GEM_HOME")) env.put("GEM_HOME", URI_CLASSLOADER);
+            if (!env.containsKey("JARS_HOME")) env.put("JARS_HOME", URI_CLASSLOADER + "jars");
             super.setEnvironment(env);
         }
         else {

diff --git a/core/src/main/java/org/jruby/embed/ScriptingContainer.java b/core/src/main/java/org/jruby/embed/ScriptingContainer.java
@@ -29,16 +29,11 @@
  */
 package org.jruby.embed;
 
-import java.io.UnsupportedEncodingException;
-
-import org.jruby.embed.internal.LocalContextProvider;
-
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.Reader;
 import java.io.Writer;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
@@ -267,7 +262,7 @@ static LocalContextProvider getProviderInstance(LocalContextScope scope, LocalVa
                 return SingletonLocalContextProvider.getProvider(behavior, lazy);
         }
     }
-    
+
     private void initRubyInstanceConfig() throws RaiseException {
         String home = SystemPropertyCatcher.findJRubyHome(this);
         if (home != null) {
@@ -1856,14 +1851,11 @@ public PrintStream getErr() {
      * @since JRuby 1.5.0
      */
     public void terminate() {
-        if (getProvider().isRuntimeInitialized()) {
-            getProvider().getRuntime().tearDown(false);
-            try {
-                getProvider().getRuntime().getJRubyClassLoader().close();
-            }
-            catch(IOException weTriedIt){}
+        LocalContextProvider provider = getProvider();
+        if (provider.isRuntimeInitialized()) {
+            provider.getRuntime().tearDown(false);
         }
-        getProvider().terminate();
+        provider.terminate();
     }
 
     /**
@@ -1876,6 +1868,7 @@ public void terminate() {
      *
      * @since JRuby 1.6.0
      */
+    @Override
     public void finalize() throws Throwable {
         super.finalize();
         // singleton containers share global runtime, and should not tear it down

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/JavaMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/JavaMethod.java
@@ -44,9 +44,9 @@ public abstract class JavaMethod extends DynamicMethod implements Cloneable, Met
     private String parameterDesc;
     private String[] parameterList;
 
-    private static String[] ONE_REQ = new String[] { "q" };
-    private static String[] TWO_REQ = new String[] { "q", "q" };
-    private static String[] THREE_REQ = new String[] { "q", "q", "q" };
+    private static final String[] ONE_REQ = new String[] { "q" };
+    private static final String[] TWO_REQ = new String[] { "q", "q" };
+    private static final String[] THREE_REQ = new String[] { "q", "q", "q" };
 
     public static final Class[][] METHODS = {
         {JavaMethodZero.class, JavaMethodZeroOrOne.class, JavaMethodZeroOrOneOrTwo.class, JavaMethodZeroOrOneOrTwoOrThree.class},
@@ -89,7 +89,7 @@ protected JavaMethod() {}
 
     public void init(RubyModule implementationClass, Arity arity, Visibility visibility, StaticScope staticScope) {
         this.staticScope = staticScope;
-        this.arity = arity;
+        setArity(arity);
         super.init(implementationClass, visibility);
     }